From a0725af2eb94a837e30401d26840660964b0bbb2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 18 Jul 2024 16:58:58 -0700 Subject: [PATCH 001/167] Set up CTest --- CMakeLists.txt | 11 +- Examples/CMakeLists.txt | 175 ++++++++++++++++++ .../langmuir/{inputs_2d => inputs_2d_base} | 0 .../inputs_2d_test_Langmuir_multi_2d_MR | 9 + ...s_2d_test_Langmuir_multi_2d_MR_anisotropic | 9 + .../inputs_2d_test_Langmuir_multi_2d_nodal | 5 + .../inputs_2d_test_Langmuir_multi_2d_psatd | 8 + Regression/WarpX-tests.ini | 30 +-- 8 files changed, 227 insertions(+), 20 deletions(-) create mode 100644 Examples/CMakeLists.txt rename Examples/Tests/langmuir/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c81a057131..6a8241e46c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -791,12 +791,13 @@ endif() # Tests ####################################################################### # +if(BUILD_TESTING) + enable_testing() -#if(BUILD_TESTING) -# enable_testing() -# -# add_test(...) -#endif() + if(WarpX_APP) + add_subdirectory(Examples) + endif() +endif() # Status Summary for Build Options ############################################ diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt new file mode 100644 index 00000000000..3d49bb052a5 --- /dev/null +++ b/Examples/CMakeLists.txt @@ -0,0 +1,175 @@ +# Configuration ############################################################### +# +if(WarpX_MPI) + # OpenMPI root guard: https://github.com/open-mpi/ompi/issues/4451 + if("$ENV{USER}" STREQUAL "root") + # calling even --help as root will abort and warn on stderr + execute_process( + COMMAND ${MPIEXEC_EXECUTABLE} --help + ERROR_VARIABLE MPIEXEC_HELP_TEXT + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(${MPIEXEC_HELP_TEXT} MATCHES "^.*allow-run-as-root.*$") + set(MPI_ALLOW_ROOT --allow-run-as-root) + endif() + endif() + set(MPI_TEST_EXE + ${MPIEXEC_EXECUTABLE} + ${MPI_ALLOW_ROOT} + ${MPIEXEC_NUMPROC_FLAG} 2 + ${MPIEXEC_POSTFLAGS} + ${MPIEXEC_PREFLAGS} + ) +endif() + +# Add a WarpX test set (with sub-tests) +# +function(add_warpx_test + name + mpi + dims + inputs_base + inputs_test + analysis + output +) + # cannot run MPI tests w/o MPI support + if(mpi AND NOT WarpX_MPI) + return() + endif() + + # make a unique run directory + file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) + set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) + + set(THIS_MPI_TEST_EXE) + if(mpi) + set(THIS_MPI_TEST_EXE ${MPI_TEST_EXE}) + endif() + + # test run + add_test( + NAME ${name}.run + COMMAND + ${THIS_MPI_TEST_EXE} + $ + ${WarpX_SOURCE_DIR}/${inputs_base} + amrex.abort_on_unused_inputs = 1 + amrex.fpe_trap_invalid = 1 + amrex.fpe_trap_overflow = 1 + amrex.fpe_trap_zero = 1 + amrex.throw_exception = 1 + warpx.always_warn_immediately = 1 + warpx.abort_on_warning_threshold = low + warpx.do_dynamic_scheduling = 0 + warpx.serialize_initial_conditions = 1 + # FILE parameter must be at the end, + # to possibly overwrite previous inputs + FILE = ${WarpX_SOURCE_DIR}/${inputs_test} + WORKING_DIRECTORY ${THIS_WORKING_DIR} + ) + + if(mpi) + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") + endif() + + # test analysis + if(analysis) + add_test( + NAME ${name}.analysis + COMMAND + ${WarpX_SOURCE_DIR}/${analysis} + ${output} + WORKING_DIRECTORY ${THIS_WORKING_DIR} + ) + set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") + endif() + +endfunction() + +# Add tests (alphabetical order) ############################################## +# + +# Langmuir_multi_2d_MR ######################################################## +# +if(2 IN_LIST WarpX_DIMS) + add_warpx_test( + Langmuir_multi_2d_MR + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() + +# Langmuir_multi_2d_MR_anisotropic ############################################ +# +if(2 IN_LIST WarpX_DIMS) + add_warpx_test( + Langmuir_multi_2d_MR_anisotropic + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() + +# Langmuir_multi_2d_MR_momentum_conserving #################################### +# +if(2 IN_LIST WarpX_DIMS) + add_warpx_test( + Langmuir_multi_2d_MR_momentum_conserving + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() + +# Langmuir_multi_2d_MR_psatd ################################################## +# +if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_MR_psatd + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() + +# Langmuir_multi_2d_nodal ##################################################### +# +if(2 IN_LIST WarpX_DIMS) + add_warpx_test( + Langmuir_multi_2d_nodal + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() + +# Langmuir_multi_2d_psatd ##################################################### +# +if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd + ON + 2 + Examples/Tests/langmuir/inputs_2d_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd + Examples/Tests/langmuir/analysis_2d.py + diags/diag1000080 + ) +endif() diff --git a/Examples/Tests/langmuir/inputs_2d b/Examples/Tests/langmuir/inputs_2d_base similarity index 100% rename from Examples/Tests/langmuir/inputs_2d rename to Examples/Tests/langmuir/inputs_2d_base diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR new file mode 100644 index 00000000000..586624654c1 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.maxwell_solver = ckc +amr.max_level = 1 +amr.ref_ratio = 4 +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.fine_tag_hi = 10.e-6 10.e-6 +warpx.fine_tag_lo = -10.e-6 -10.e-6 +warpx.use_filter = 1 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic new file mode 100644 index 00000000000..91c2d1c80d3 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.maxwell_solver = ckc +amr.max_level = 1 +amr.ref_ratio_vect = 4 2 +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.fine_tag_hi = 10.e-6 10.e-6 +warpx.fine_tag_lo = -10.e-6 -10.e-6 +warpx.use_filter = 1 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal new file mode 100644 index 00000000000..a5c132eef91 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal @@ -0,0 +1,5 @@ +# additional runtime parameters +algo.current_deposition = direct +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd new file mode 100644 index 00000000000..343cc0cede1 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd @@ -0,0 +1,8 @@ +# additional runtime parameters +algo.maxwell_solver = psatd +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 17ecfd64f29..2ea8018fd8c 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -1011,7 +1011,7 @@ analysisOutputImage = langmuir_multi_1d_analysis.png [Langmuir_multi_2d_MR] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz dim = 2 addToCompileString = @@ -1026,7 +1026,7 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_anisotropic] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz dim = 2 addToCompileString = @@ -1041,7 +1041,7 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz dim = 2 addToCompileString = @@ -1056,7 +1056,7 @@ analysisOutputImage = Langmuir_multi_2d_MR_momentum_conserving.png [Langmuir_multi_2d_MR_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1071,7 +1071,7 @@ analysisOutputImage = Langmuir_multi_2d_MR_psatd.png [Langmuir_multi_2d_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz dim = 2 addToCompileString = @@ -1086,7 +1086,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1101,7 +1101,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1116,7 +1116,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1131,7 +1131,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1146,7 +1146,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_multiJ] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1161,7 +1161,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png [Langmuir_multi_2d_psatd_multiJ_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated dim = 2 addToCompileString = USE_FFT=TRUE @@ -1176,7 +1176,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png [Langmuir_multi_2d_psatd_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1191,7 +1191,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1206,7 +1206,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1221,7 +1221,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE From 73df3eb771cc5f311e557e9fa3db0536dd7ee7e5 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 22 Jul 2024 17:43:22 -0700 Subject: [PATCH 002/167] Add argument for MPI procs, improve readability --- Examples/CMakeLists.txt | 179 ++++++++++++++++++++++++++++------------ 1 file changed, 128 insertions(+), 51 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3d49bb052a5..bf46dcf668d 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -13,21 +13,15 @@ if(WarpX_MPI) set(MPI_ALLOW_ROOT --allow-run-as-root) endif() endif() - set(MPI_TEST_EXE - ${MPIEXEC_EXECUTABLE} - ${MPI_ALLOW_ROOT} - ${MPIEXEC_NUMPROC_FLAG} 2 - ${MPIEXEC_POSTFLAGS} - ${MPIEXEC_PREFLAGS} - ) endif() # Add a WarpX test set (with sub-tests) # function(add_warpx_test name - mpi dims + mpi + mpi_np inputs_base inputs_test analysis @@ -44,7 +38,13 @@ function(add_warpx_test set(THIS_MPI_TEST_EXE) if(mpi) - set(THIS_MPI_TEST_EXE ${MPI_TEST_EXE}) + set(THIS_MPI_TEST_EXE + ${MPIEXEC_EXECUTABLE} + ${MPI_ALLOW_ROOT} + ${MPIEXEC_NUMPROC_FLAG} ${mpi_np} + ${MPIEXEC_POSTFLAGS} + ${MPIEXEC_PREFLAGS} + ) endif() # test run @@ -93,83 +93,160 @@ endfunction() # Langmuir_multi_2d_MR ######################################################## # if(2 IN_LIST WarpX_DIMS) + set(name Langmuir_multi_2d_MR) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_MR - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() # Langmuir_multi_2d_MR_anisotropic ############################################ # if(2 IN_LIST WarpX_DIMS) + set(name Langmuir_multi_2d_MR_anisotropic) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_MR_anisotropic - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() # Langmuir_multi_2d_MR_momentum_conserving #################################### # if(2 IN_LIST WarpX_DIMS) + set(name Langmuir_multi_2d_MR_momentum_conserving) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_MR_momentum_conserving - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() # Langmuir_multi_2d_MR_psatd ################################################## # if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) + set(name Langmuir_multi_2d_MR_psatd) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_MR_psatd - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() # Langmuir_multi_2d_nodal ##################################################### # if(2 IN_LIST WarpX_DIMS) + set(name Langmuir_multi_2d_nodal) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_nodal - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() # Langmuir_multi_2d_psatd ##################################################### # if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) + set(name Langmuir_multi_2d_psatd) + set(dims 2) + set(mpi ON) + set(mpi_np 2) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) + add_warpx_test( + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} + ) +endif() + +# Langmuir_multi_2d_psatd_current_correction ################################## +# +if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) + set(name Langmuir_multi_2d_psatd_current_correction) + set(dims 2) + set(mpi ON) + set(mpi_np 1) + set(inputs_base Examples/Tests/langmuir/inputs_2d_base) + set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction) + set(analysis Examples/Tests/langmuir/analysis_2d.py) + set(output diags/diag1000080) add_warpx_test( - Langmuir_multi_2d_psatd - ON - 2 - Examples/Tests/langmuir/inputs_2d_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd - Examples/Tests/langmuir/analysis_2d.py - diags/diag1000080 + ${name} + ${dims} + ${mpi} + ${mpi_np} + ${inputs_base} + ${inputs_test} + ${analysis} + ${output} ) endif() From 23d379e67da86fe4226c4cd5f21a566d874c7694 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 23 Jul 2024 09:57:49 -0700 Subject: [PATCH 003/167] Add missing input files --- ...s_2d_test_Langmuir_multi_2d_MR_momentum_conserving | 10 ++++++++++ .../inputs_2d_test_Langmuir_multi_2d_MR_psatd | 11 +++++++++++ ...2d_test_Langmuir_multi_2d_psatd_current_correction | 10 ++++++++++ 3 files changed, 31 insertions(+) create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving new file mode 100644 index 00000000000..7f3cb50fd91 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving @@ -0,0 +1,10 @@ +# additional runtime parameters +algo.field_gathering = momentum-conserving +algo.maxwell_solver = ckc +amr.max_level = 1 +amr.ref_ratio = 4 +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.use_filter = 1 +warpx.fine_tag_lo = -10.e-6 -10.e-6 +warpx.fine_tag_hi = 10.e-6 10.e-6 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd new file mode 100644 index 00000000000..49296a2a04f --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd @@ -0,0 +1,11 @@ +# additional runtime parameters +algo.maxwell_solver = psatd +amr.max_level = 1 +amr.ref_ratio = 4 +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.fine_tag_hi = 10.e-6 10.e-6 +warpx.fine_tag_lo = -10.e-6 -10.e-6 +warpx.use_filter = 1 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction new file mode 100644 index 00000000000..0fc4f59aa18 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction @@ -0,0 +1,10 @@ +# additional runtime parameters +algo.current_deposition = esirkepov +algo.maxwell_solver = psatd +amr.max_grid_size = 128 +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +warpx.cfl = 0.7071067811865475 From e71252ccf749ddcc17aed62bd54f31caad1e7ce8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 23 Jul 2024 12:06:08 -0700 Subject: [PATCH 004/167] Apply suggestions from code review --- Examples/CMakeLists.txt | 202 ++++++++++++++-------------------------- 1 file changed, 71 insertions(+), 131 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index bf46dcf668d..947d3a31afc 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -32,6 +32,10 @@ function(add_warpx_test return() endif() + if(NOT dims IN_LIST WarpX_DIMS) + return() + endif() + # make a unique run directory file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) @@ -92,161 +96,97 @@ endfunction() # Langmuir_multi_2d_MR ######################################################## # -if(2 IN_LIST WarpX_DIMS) - set(name Langmuir_multi_2d_MR) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) - add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} - ) -endif() +add_warpx_test( + Langmuir_multi_2d_MR # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output +) # Langmuir_multi_2d_MR_anisotropic ############################################ # -if(2 IN_LIST WarpX_DIMS) - set(name Langmuir_multi_2d_MR_anisotropic) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) - add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} - ) -endif() +add_warpx_test( + Langmuir_multi_2d_MR_anisotropic # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output +) # Langmuir_multi_2d_MR_momentum_conserving #################################### # -if(2 IN_LIST WarpX_DIMS) - set(name Langmuir_multi_2d_MR_momentum_conserving) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) - add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} - ) -endif() +add_warpx_test( + Langmuir_multi_2d_MR_momentum_conserving # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output +) # Langmuir_multi_2d_MR_psatd ################################################## # -if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) - set(name Langmuir_multi_2d_MR_psatd) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) +if(WarpX_FFT) add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} + Langmuir_multi_2d_MR_psatd # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output ) endif() # Langmuir_multi_2d_nodal ##################################################### # -if(2 IN_LIST WarpX_DIMS) - set(name Langmuir_multi_2d_nodal) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) - add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} - ) -endif() +add_warpx_test( + Langmuir_multi_2d_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output +) # Langmuir_multi_2d_psatd ##################################################### # -if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) - set(name Langmuir_multi_2d_psatd) - set(dims 2) - set(mpi ON) - set(mpi_np 2) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) +if(WarpX_FFT) add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} + Langmuir_multi_2d_psatd # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output ) endif() # Langmuir_multi_2d_psatd_current_correction ################################## # -if(2 IN_LIST WarpX_DIMS AND WarpX_FFT) - set(name Langmuir_multi_2d_psatd_current_correction) - set(dims 2) - set(mpi ON) - set(mpi_np 1) - set(inputs_base Examples/Tests/langmuir/inputs_2d_base) - set(inputs_test Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction) - set(analysis Examples/Tests/langmuir/analysis_2d.py) - set(output diags/diag1000080) +if(WarpX_FFT) add_warpx_test( - ${name} - ${dims} - ${mpi} - ${mpi_np} - ${inputs_base} - ${inputs_test} - ${analysis} - ${output} + Langmuir_multi_2d_psatd_current_correction # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output ) endif() From b32882c2927437a107e05ab3582f176a7513c084 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 23 Jul 2024 16:23:18 -0700 Subject: [PATCH 005/167] Add more tests --- Examples/CMakeLists.txt | 30 +++++++++++++++++++ ...ir_multi_2d_psatd_current_correction_nodal | 11 +++++++ ...angmuir_multi_2d_psatd_momentum_conserving | 9 ++++++ 3 files changed, 50 insertions(+) create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 947d3a31afc..84e65414083 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -190,3 +190,33 @@ if(WarpX_FFT) diags/diag1000080 # output ) endif() + +# Langmuir_multi_2d_psatd_current_correction_nodal ############################ +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_current_correction_nodal # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_2d_psatd_momentum_conserving ################################# +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_momentum_conserving # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal new file mode 100644 index 00000000000..5f23ad4ffdb --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal @@ -0,0 +1,11 @@ +# additional runtime parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +amr.max_grid_size = 128 +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +warpx.cfl = 0.7071067811865475 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving new file mode 100644 index 00000000000..39e3eaeeadf --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.field_gathering = momentum-conserving +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 From c818ee0a577ff175483b7b817664a6ea583eadbe Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 23 Jul 2024 16:56:55 -0700 Subject: [PATCH 006/167] Fix naming convention to unblock style check --- Examples/CMakeLists.txt | 36 +++++++++---------- ..._MR => add_inputs_2d_Langmuir_multi_2d_MR} | 0 ...nputs_2d_Langmuir_multi_2d_MR_anisotropic} | 0 ..._Langmuir_multi_2d_MR_momentum_conserving} | 0 ... add_inputs_2d_Langmuir_multi_2d_MR_psatd} | 0 ... => add_inputs_2d_Langmuir_multi_2d_nodal} | 0 ... => add_inputs_2d_Langmuir_multi_2d_psatd} | 0 ...angmuir_multi_2d_psatd_current_correction} | 0 ...r_multi_2d_psatd_current_correction_nodal} | 0 ...ngmuir_multi_2d_psatd_momentum_conserving} | 0 .../langmuir/{inputs_2d_base => inputs_2d} | 0 Regression/WarpX-tests.ini | 30 ++++++++-------- 12 files changed, 33 insertions(+), 33 deletions(-) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR => add_inputs_2d_Langmuir_multi_2d_MR} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_anisotropic => add_inputs_2d_Langmuir_multi_2d_MR_anisotropic} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving => add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_psatd => add_inputs_2d_Langmuir_multi_2d_MR_psatd} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_nodal => add_inputs_2d_Langmuir_multi_2d_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd => add_inputs_2d_Langmuir_multi_2d_psatd} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_current_correction => add_inputs_2d_Langmuir_multi_2d_psatd_current_correction} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal => add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving => add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving} (100%) rename Examples/Tests/langmuir/{inputs_2d_base => inputs_2d} (100%) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 84e65414083..80b29b33471 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -101,8 +101,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -114,8 +114,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -127,8 +127,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -141,8 +141,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -155,8 +155,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -169,8 +169,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -184,8 +184,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -199,8 +199,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -214,8 +214,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving rename to Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving diff --git a/Examples/Tests/langmuir/inputs_2d_base b/Examples/Tests/langmuir/inputs_2d similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_base rename to Examples/Tests/langmuir/inputs_2d diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 2ea8018fd8c..17ecfd64f29 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -1011,7 +1011,7 @@ analysisOutputImage = langmuir_multi_1d_analysis.png [Langmuir_multi_2d_MR] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz dim = 2 addToCompileString = @@ -1026,7 +1026,7 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_anisotropic] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz dim = 2 addToCompileString = @@ -1041,7 +1041,7 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz dim = 2 addToCompileString = @@ -1056,7 +1056,7 @@ analysisOutputImage = Langmuir_multi_2d_MR_momentum_conserving.png [Langmuir_multi_2d_MR_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1071,7 +1071,7 @@ analysisOutputImage = Langmuir_multi_2d_MR_psatd.png [Langmuir_multi_2d_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz dim = 2 addToCompileString = @@ -1086,7 +1086,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1101,7 +1101,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1116,7 +1116,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1131,7 +1131,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1146,7 +1146,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_multiJ] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1161,7 +1161,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png [Langmuir_multi_2d_psatd_multiJ_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated dim = 2 addToCompileString = USE_FFT=TRUE @@ -1176,7 +1176,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png [Langmuir_multi_2d_psatd_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1191,7 +1191,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1206,7 +1206,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1221,7 +1221,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base +inputFile = Examples/Tests/langmuir/inputs_2d runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE From 9affb1a4670c1ac052186529e37852ff788fc9d2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 23 Jul 2024 17:17:16 -0700 Subject: [PATCH 007/167] Add more tests --- Examples/CMakeLists.txt | 15 +++++++++++++++ .../add_inputs_2d_Langmuir_multi_2d_psatd_multiJ | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 80b29b33471..afb75500cb1 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -220,3 +220,18 @@ if(WarpX_FFT) diags/diag1000080 # output ) endif() + +# Langmuir_multi_2d_psatd_multiJ ############################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_multiJ # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d # inputs_base + Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ new file mode 100644 index 00000000000..bb4b6a180ec --- /dev/null +++ b/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.maxwell_solver = psatd +psatd.J_in_time = linear +psatd.solution_type = first-order +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 2 From 01660ebe7a5766e2c95e35f38f1517a7d80e20ed Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 24 Jul 2024 10:24:50 -0700 Subject: [PATCH 008/167] Update source/style checks, use new input files in current CI workflows --- .../workflows/source/wrongFileNameInExamples | 4 +- Examples/CMakeLists.txt | 40 ++++++------- .../langmuir/{inputs_2d => inputs_2d_base} | 0 ...MR => inputs_2d_test_Langmuir_multi_2d_MR} | 0 ..._2d_test_Langmuir_multi_2d_MR_anisotropic} | 0 ..._Langmuir_multi_2d_MR_momentum_conserving} | 0 ...inputs_2d_test_Langmuir_multi_2d_MR_psatd} | 0 ...=> inputs_2d_test_Langmuir_multi_2d_nodal} | 0 ...=> inputs_2d_test_Langmuir_multi_2d_psatd} | 0 ...angmuir_multi_2d_psatd_current_correction} | 0 ...r_multi_2d_psatd_current_correction_nodal} | 0 ...ngmuir_multi_2d_psatd_momentum_conserving} | 0 ...ts_2d_test_Langmuir_multi_2d_psatd_multiJ} | 0 Regression/WarpX-tests.ini | 60 +++++++++++-------- 14 files changed, 58 insertions(+), 46 deletions(-) rename Examples/Tests/langmuir/{inputs_2d => inputs_2d_base} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_MR => inputs_2d_test_Langmuir_multi_2d_MR} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_MR_anisotropic => inputs_2d_test_Langmuir_multi_2d_MR_anisotropic} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving => inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_MR_psatd => inputs_2d_test_Langmuir_multi_2d_MR_psatd} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_nodal => inputs_2d_test_Langmuir_multi_2d_nodal} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_psatd => inputs_2d_test_Langmuir_multi_2d_psatd} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_psatd_current_correction => inputs_2d_test_Langmuir_multi_2d_psatd_current_correction} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal => inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving => inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving} (100%) rename Examples/Tests/langmuir/{add_inputs_2d_Langmuir_multi_2d_psatd_multiJ => inputs_2d_test_Langmuir_multi_2d_psatd_multiJ} (100%) diff --git a/.github/workflows/source/wrongFileNameInExamples b/.github/workflows/source/wrongFileNameInExamples index 0de69d69c9c..aa92777b4c0 100755 --- a/.github/workflows/source/wrongFileNameInExamples +++ b/.github/workflows/source/wrongFileNameInExamples @@ -19,7 +19,8 @@ do [[ ${file:0:8 } != analysis ]] && [[ ${file: -4} != yaml ]] && [[ ${file:0:4 } != plot ]] && - [[ ${file:0:6 } != README ]] + [[ ${file:0:6 } != README ]] && + [[ ${file:0:10} != CMakeLists ]] then files+=($file) echo "$pathtofile does not have a proper name!" @@ -36,6 +37,7 @@ then echo " - analysis : for scripts testing the accuracy of a test" echo " - *.yaml : for third-party input, e.g. Ascent in situ visualization" echo " - README : for readme files" + echo " - CMakeLists : for CMake files" echo "" echo "Please rename the file(s) to comply, or move to another folder" fi diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index afb75500cb1..853907b5ef8 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -101,8 +101,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -114,8 +114,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -127,8 +127,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -141,8 +141,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -155,8 +155,8 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -169,8 +169,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -184,8 +184,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -199,8 +199,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -214,8 +214,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -229,8 +229,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d # inputs_base - Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ # inputs_test + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir/inputs_2d b/Examples/Tests/langmuir/inputs_2d_base similarity index 100% rename from Examples/Tests/langmuir/inputs_2d rename to Examples/Tests/langmuir/inputs_2d_base diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_anisotropic rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_momentum_conserving rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_MR_psatd rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_nodal rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_current_correction_nodal rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_momentum_conserving rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving diff --git a/Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ similarity index 100% rename from Examples/Tests/langmuir/add_inputs_2d_Langmuir_multi_2d_psatd_multiJ rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 17ecfd64f29..784c9e9bf43 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -1011,8 +1011,9 @@ analysisOutputImage = langmuir_multi_1d_analysis.png [Langmuir_multi_2d_MR] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -1026,8 +1027,9 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_anisotropic] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_anisotropic dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -1041,8 +1043,9 @@ analysisOutputImage = Langmuir_multi_2d_MR.png [Langmuir_multi_2d_MR_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -1056,8 +1059,9 @@ analysisOutputImage = Langmuir_multi_2d_MR_momentum_conserving.png [Langmuir_multi_2d_MR_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_psatd dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1071,8 +1075,9 @@ analysisOutputImage = Langmuir_multi_2d_MR_psatd.png [Langmuir_multi_2d_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_nodal dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -1086,8 +1091,9 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1101,8 +1107,9 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_current_correction dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1116,8 +1123,9 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_current_correction_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1131,8 +1139,9 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_momentum_conserving] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1146,8 +1155,9 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_multiJ] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d -runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/langmuir/inputs_2d_base +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_multiJ dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1161,7 +1171,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png [Langmuir_multi_2d_psatd_multiJ_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated dim = 2 addToCompileString = USE_FFT=TRUE @@ -1176,7 +1186,7 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png [Langmuir_multi_2d_psatd_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium dim = 2 addToCompileString = USE_FFT=TRUE @@ -1191,7 +1201,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1206,7 +1216,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 dim = 2 addToCompileString = USE_FFT=TRUE @@ -1221,7 +1231,7 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_nodal] buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d +inputFile = Examples/Tests/langmuir/inputs_2d_base runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 dim = 2 addToCompileString = USE_FFT=TRUE From 84b9e00d3425411cc009c14248e5f3400446160b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 25 Jul 2024 13:59:24 -0700 Subject: [PATCH 009/167] Add more tests --- Examples/CMakeLists.txt | 149 ++++++++++++++++++ .../{inputs_2d => inputs_2d_base} | 0 .../inputs_2d_test_background_mcc | 2 + ...est_Langmuir_multi_2d_psatd_Vay_deposition | 8 + ...ngmuir_multi_2d_psatd_Vay_deposition_nodal | 9 ++ ...i_2d_psatd_Vay_deposition_particle_shape_4 | 9 ++ ..._test_Langmuir_multi_2d_psatd_multiJ_nodal | 10 ++ ...puts_2d_test_Langmuir_multi_2d_psatd_nodal | 10 ++ .../{inputs_avg_2d => inputs_avg_2d_base} | 0 ...uts_avg_2d_test_averaged_galilean_2d_psatd | 3 + ..._2d_test_averaged_galilean_2d_psatd_hybrid | 6 + .../{inputs_avg_3d => inputs_avg_3d_base} | 0 ...uts_avg_3d_test_averaged_galilean_3d_psatd | 3 + ..._3d_test_averaged_galilean_3d_psatd_hybrid | 4 + Regression/WarpX-tests.ini | 40 +++-- 15 files changed, 238 insertions(+), 15 deletions(-) rename Examples/Physics_applications/capacitive_discharge/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal create mode 100644 Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal rename Examples/Tests/nci_psatd_stability/{inputs_avg_2d => inputs_avg_2d_base} (100%) create mode 100644 Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd create mode 100644 Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid rename Examples/Tests/nci_psatd_stability/{inputs_avg_3d => inputs_avg_3d_base} (100%) create mode 100644 Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd create mode 100644 Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 853907b5ef8..a8db268cc59 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -94,6 +94,79 @@ endfunction() # Add tests (alphabetical order) ############################################## # +# averaged_galilean_2d_psatd ################################################## +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_2d_psatd # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# averaged_galilean_2d_psatd_hybrid ########################################### +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_2d_psatd_hybrid # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# averaged_galilean_3d_psatd ################################################## +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_3d_psatd # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000160 # output + ) +endif() + +# averaged_galilean_3d_psatd_hybrid ########################################### +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_3d_psatd_hybrid # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000160 # output + ) +endif() + +# background_mcc ############################################################## +# +add_warpx_test( + background_mcc # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base + Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test + Examples/analysis_default_regression.py # analysis + diags/diag1000050 # output +) + # Langmuir_multi_2d_MR ######################################################## # add_warpx_test( @@ -235,3 +308,79 @@ if(WarpX_FFT) diags/diag1000080 # output ) endif() + +# Langmuir_multi_2d_psatd_multiJ_nodal ######################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_multiJ_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_2d_psatd_nodal ############################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_2d_psatd_Vay_deposition ###################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_Vay_deposition # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 ##################### +# +# FIXME +#if(WarpX_FFT) +# add_warpx_test( +# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name +# 2 # dims +# ON # mpi +# 1 # mpi_np +# Examples/Tests/langmuir/inputs_2d_base # inputs_base +# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test +# Examples/Tests/langmuir/analysis_2d.py # analysis +# diags/diag1000080 # output +# ) +#endif() + +# Langmuir_multi_2d_psatd_Vay_deposition_nodal ################################ +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_Vay_deposition_nodal # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + ) +endif() diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d b/Examples/Physics_applications/capacitive_discharge/inputs_2d_base similarity index 100% rename from Examples/Physics_applications/capacitive_discharge/inputs_2d rename to Examples/Physics_applications/capacitive_discharge/inputs_2d_base diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc new file mode 100644 index 00000000000..8a0011c98ad --- /dev/null +++ b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc @@ -0,0 +1,2 @@ +# additional runtime parameters +warpx.abort_on_warning_threshold = high diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition new file mode 100644 index 00000000000..1c40777711a --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition @@ -0,0 +1,8 @@ +# additional runtime parameters +algo.current_deposition = vay +algo.maxwell_solver = psatd +amr.max_grid_size = 128 +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.cfl = 0.7071067811865475 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal new file mode 100644 index 00000000000..a514c1561f0 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.current_deposition = vay +algo.maxwell_solver = psatd +amr.max_grid_size = 128 +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.cfl = 0.7071067811865475 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 new file mode 100644 index 00000000000..3f216a84708 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 @@ -0,0 +1,9 @@ +# additional runtime parameters +algo.current_deposition = vay +algo.maxwell_solver = psatd +algo.particle_shape = 4 +amr.max_grid_size = 128 +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +warpx.cfl = 0.7071067811865475 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal new file mode 100644 index 00000000000..f71c7bebb73 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal @@ -0,0 +1,10 @@ +# additional runtime parameters +algo.maxwell_solver = psatd +psatd.J_in_time = linear +psatd.solution_type = first-order +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 2 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal new file mode 100644 index 00000000000..f865571edf7 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal @@ -0,0 +1,10 @@ +# additional runtime parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell +diag1.electrons.variables = x z w ux uy uz +diag1.positrons.variables = x z w ux uy uz +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 +warpx.grid_type = collocated diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_base similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_avg_2d rename to Examples/Tests/nci_psatd_stability/inputs_avg_2d_base diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd new file mode 100644 index 00000000000..c7b32a2cf88 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd @@ -0,0 +1,3 @@ +# additional runtime parameters +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid new file mode 100644 index 00000000000..338daed4764 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid @@ -0,0 +1,6 @@ +# additional runtime parameters +amr.max_grid_size_x = 128 +amr.max_grid_size_y = 64 +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.grid_type = hybrid diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_base similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_avg_3d rename to Examples/Tests/nci_psatd_stability/inputs_avg_3d_base diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd new file mode 100644 index 00000000000..c7b32a2cf88 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd @@ -0,0 +1,3 @@ +# additional runtime parameters +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid new file mode 100644 index 00000000000..03990cec08c --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid @@ -0,0 +1,4 @@ +# additional runtime parameters +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.grid_type = hybrid diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 784c9e9bf43..670242088a2 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -71,8 +71,9 @@ cmakeSetupOpts = -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF [averaged_galilean_2d_psatd] buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d -runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base +aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd +runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -85,8 +86,9 @@ analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_2d_psatd_hybrid] buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d -runtime_params = amr.max_grid_size_x=128 amr.max_grid_size_y=64 warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base +aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid +runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -99,8 +101,9 @@ analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_3d_psatd] buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d -runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d_base +aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd +runtime_params = FILE=inputs_avg_3d_test_averaged_galilean_3d_psatd dim = 3 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON @@ -113,8 +116,9 @@ analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_3d_psatd_hybrid] buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d -runtime_params = warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d_base +aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid +runtime_params = FILE=inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid dim = 3 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON @@ -127,8 +131,9 @@ analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [background_mcc] buildDir = . -inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d -runtime_params = warpx.abort_on_warning_threshold = high +inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d_base +aux1File = Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc +runtime_params = FILE=inputs_2d_test_background_mcc dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -1172,7 +1177,8 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png [Langmuir_multi_2d_psatd_multiJ_nodal] buildDir = . inputFile = Examples/Tests/langmuir/inputs_2d_base -runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1187,7 +1193,8 @@ analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png [Langmuir_multi_2d_psatd_nodal] buildDir = . inputFile = Examples/Tests/langmuir/inputs_2d_base -runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_nodal dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1202,7 +1209,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition] buildDir = . inputFile = Examples/Tests/langmuir/inputs_2d_base -runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1217,7 +1225,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] buildDir = . inputFile = Examples/Tests/langmuir/inputs_2d_base -runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON @@ -1232,7 +1241,8 @@ analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_2d_psatd_Vay_deposition_nodal] buildDir = . inputFile = Examples/Tests/langmuir/inputs_2d_base -runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal +runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal dim = 2 addToCompileString = USE_FFT=TRUE cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON From feecc4f2073b26a9c33b4064fa1e3472ce425a33 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 26 Jul 2024 14:59:54 -0700 Subject: [PATCH 010/167] Make additional runtime params input file optional --- Examples/CMakeLists.txt | 118 +++++++++++++----- .../{inputs_2d => inputs_2d_base} | 0 .../inputs_2d_test_bilinear_filter | 3 + Regression/WarpX-tests.ini | 5 +- 4 files changed, 90 insertions(+), 36 deletions(-) rename Examples/Tests/single_particle/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Tests/single_particle/inputs_2d_test_bilinear_filter diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index a8db268cc59..d41d5bb1544 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -23,9 +23,9 @@ function(add_warpx_test mpi mpi_np inputs_base - inputs_test analysis output + #inputs_test (optional) ) # cannot run MPI tests w/o MPI support if(mpi AND NOT WarpX_MPI) @@ -36,6 +36,9 @@ function(add_warpx_test return() endif() + # set dimension suffix + warpx_set_suffix_dims(SD ${dims}) + # make a unique run directory file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) @@ -51,25 +54,33 @@ function(add_warpx_test ) endif() + set(runtime_params + "amrex.abort_on_unused_inputs = 1" + "amrex.fpe_trap_invalid = 1" + "amrex.fpe_trap_overflow = 1" + "amrex.fpe_trap_zero = 1" + "amrex.throw_exception = 1" + "warpx.always_warn_immediately = 1" + "warpx.abort_on_warning_threshold = low" + "warpx.do_dynamic_scheduling = 0" + "warpx.serialize_initial_conditions = 1" + ) + + # FILE parameter must be at the end, + # to possibly overwrite previous inputs + # FIXME Avoid magic numbers + if(${ARGC} GREATER 7) + list(APPEND runtime_params "FILE = ${WarpX_SOURCE_DIR}/${ARGV7}") + endif() + # test run add_test( NAME ${name}.run COMMAND ${THIS_MPI_TEST_EXE} - $ + $ ${WarpX_SOURCE_DIR}/${inputs_base} - amrex.abort_on_unused_inputs = 1 - amrex.fpe_trap_invalid = 1 - amrex.fpe_trap_overflow = 1 - amrex.fpe_trap_zero = 1 - amrex.throw_exception = 1 - warpx.always_warn_immediately = 1 - warpx.abort_on_warning_threshold = low - warpx.do_dynamic_scheduling = 0 - warpx.serialize_initial_conditions = 1 - # FILE parameter must be at the end, - # to possibly overwrite previous inputs - FILE = ${WarpX_SOURCE_DIR}/${inputs_test} + ${runtime_params} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) @@ -103,9 +114,9 @@ if(WarpX_FFT) ON # mpi 1 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test ) endif() @@ -118,9 +129,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test ) endif() @@ -133,9 +144,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test ) endif() @@ -148,9 +159,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test ) endif() @@ -162,9 +173,48 @@ add_warpx_test( ON # mpi 2 # mpi_np Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base - Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test Examples/analysis_default_regression.py # analysis diags/diag1000050 # output + Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test +) + +# background_mcc_dp_psp ####################################################### +# +# FIXME +#add_warpx_test( +# background_mcc_dp_psp # name +# 2 # dims +# ON # mpi +# 2 # mpi_np +# Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base +# Examples/analysis_default_regression.py # analysis +# diags/diag1000050 # output +# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs_test +#) + +# bilinear_filter ############################################################# +# +add_warpx_test( + bilinear_filter # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/single_particle/inputs_2d_base # inputs_base + Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis + diags/diag1000001 # output + Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs_test +) + +# BTD_rz ###################################################################### +# +add_warpx_test( + BTD_rz # name + RZ # dims + ON # mpi + 2 # mpi_np + Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD # inputs_base + Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis + diags/diag1000289 # output ) # Langmuir_multi_2d_MR ######################################################## @@ -175,9 +225,9 @@ add_warpx_test( ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test ) # Langmuir_multi_2d_MR_anisotropic ############################################ @@ -188,9 +238,9 @@ add_warpx_test( ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test ) # Langmuir_multi_2d_MR_momentum_conserving #################################### @@ -201,9 +251,9 @@ add_warpx_test( ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test ) # Langmuir_multi_2d_MR_psatd ################################################## @@ -215,9 +265,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test ) endif() @@ -229,9 +279,9 @@ add_warpx_test( ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test ) # Langmuir_multi_2d_psatd ##################################################### @@ -243,9 +293,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test ) endif() @@ -258,9 +308,9 @@ if(WarpX_FFT) ON # mpi 1 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test ) endif() @@ -273,9 +323,9 @@ if(WarpX_FFT) ON # mpi 1 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test ) endif() @@ -288,9 +338,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test ) endif() @@ -303,9 +353,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test ) endif() @@ -318,9 +368,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test ) endif() @@ -333,9 +383,9 @@ if(WarpX_FFT) ON # mpi 2 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test ) endif() @@ -348,9 +398,9 @@ if(WarpX_FFT) ON # mpi 1 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test ) endif() @@ -364,9 +414,9 @@ endif() # ON # mpi # 1 # mpi_np # Examples/Tests/langmuir/inputs_2d_base # inputs_base -# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output +# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test # ) #endif() @@ -379,8 +429,8 @@ if(WarpX_FFT) ON # mpi 1 # mpi_np Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test ) endif() diff --git a/Examples/Tests/single_particle/inputs_2d b/Examples/Tests/single_particle/inputs_2d_base similarity index 100% rename from Examples/Tests/single_particle/inputs_2d rename to Examples/Tests/single_particle/inputs_2d_base diff --git a/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter b/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter new file mode 100644 index 00000000000..4f225468f3b --- /dev/null +++ b/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter @@ -0,0 +1,3 @@ +# additional runtime parameters +warpx.filter_npass_each_dir = 1 5 +warpx.use_filter = 1 diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 670242088a2..5afc10e2263 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -160,8 +160,9 @@ analysisRoutine = Examples/analysis_default_regression.py [bilinear_filter] buildDir = . -inputFile = Examples/Tests/single_particle/inputs_2d -runtime_params = warpx.use_filter=1 warpx.filter_npass_each_dir=1 5 +inputFile = Examples/Tests/single_particle/inputs_2d_base +aux1File = Examples/Tests/single_particle/inputs_2d_test_bilinear_filter +runtime_params = FILE=inputs_2d_test_bilinear_filter dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 From 53d85b4c9f5b10d09dc5c7fb7b0dad8c741962aa Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 26 Jul 2024 16:23:57 -0700 Subject: [PATCH 011/167] Add more tests --- Examples/CMakeLists.txt | 16 ++++++++++++++-- ..._boosted_BTD => inputs_rz_z_boosted_BTD_base} | 0 .../analysis_multiple_particles.py | 2 +- ...rticles => inputs_3d_multiple_particles_base} | 0 ..._multiple_particles_test_collider_diagnostics | 2 ++ Examples/Tests/single_particle/inputs_2d_base | 2 ++ .../inputs_2d_test_bilinear_filter | 3 --- Regression/WarpX-tests.ini | 10 +++++----- 8 files changed, 24 insertions(+), 11 deletions(-) rename Examples/Tests/btd_rz/{inputs_rz_z_boosted_BTD => inputs_rz_z_boosted_BTD_base} (100%) rename Examples/Tests/collider_relevant_diags/{inputs_3d_multiple_particles => inputs_3d_multiple_particles_base} (100%) create mode 100644 Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics delete mode 100644 Examples/Tests/single_particle/inputs_2d_test_bilinear_filter diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index d41d5bb1544..ff4fb3ca522 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -202,7 +202,6 @@ add_warpx_test( Examples/Tests/single_particle/inputs_2d_base # inputs_base Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output - Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs_test ) # BTD_rz ###################################################################### @@ -212,11 +211,24 @@ add_warpx_test( RZ # dims ON # mpi 2 # mpi_np - Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD # inputs_base + Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs_base Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output ) +# collider_diagnostics ######################################################## +# +add_warpx_test( + collider_diagnostics # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base # inputs_base + Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis + diags/diag1000001 # output + Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs_test +) + # Langmuir_multi_2d_MR ######################################################## # add_warpx_test( diff --git a/Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD b/Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base similarity index 100% rename from Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD rename to Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index b23bb69d52c..7bf4ef04d6b 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -54,7 +54,7 @@ def dL_dt(): lumi.append(l) return lumi -input_dict = parse_input_file('inputs_3d_multiple_particles') +input_dict = parse_input_file('../../../../warpx/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base') Ex, Ey, Ez = [float(w) for w in input_dict['particles.E_external_particle']] Bx, By, Bz = [float(w) for w in input_dict['particles.B_external_particle']] diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base similarity index 100% rename from Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles rename to Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics new file mode 100644 index 00000000000..8a0011c98ad --- /dev/null +++ b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics @@ -0,0 +1,2 @@ +# additional runtime parameters +warpx.abort_on_warning_threshold = high diff --git a/Examples/Tests/single_particle/inputs_2d_base b/Examples/Tests/single_particle/inputs_2d_base index 71ca2101c22..6f8eb6fdcea 100644 --- a/Examples/Tests/single_particle/inputs_2d_base +++ b/Examples/Tests/single_particle/inputs_2d_base @@ -14,6 +14,8 @@ boundary.field_hi = pec pec algo.charge_deposition = standard algo.field_gathering = energy-conserving warpx.cfl = 1.0 +warpx.use_filter = 1 +warpx.filter_npass_each_dir = 1 5 # Order of particle shape factors algo.particle_shape = 1 diff --git a/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter b/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter deleted file mode 100644 index 4f225468f3b..00000000000 --- a/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter +++ /dev/null @@ -1,3 +0,0 @@ -# additional runtime parameters -warpx.filter_npass_each_dir = 1 5 -warpx.use_filter = 1 diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 5afc10e2263..880bf7b2eda 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -161,8 +161,7 @@ analysisRoutine = Examples/analysis_default_regression.py [bilinear_filter] buildDir = . inputFile = Examples/Tests/single_particle/inputs_2d_base -aux1File = Examples/Tests/single_particle/inputs_2d_test_bilinear_filter -runtime_params = FILE=inputs_2d_test_bilinear_filter +runtime_params = dim = 2 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=2 @@ -175,7 +174,7 @@ analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py [BTD_rz] buildDir = . -inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD +inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base runtime_params = dim = 2 addToCompileString = USE_RZ=TRUE @@ -189,8 +188,9 @@ analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py [collider_diagnostics] buildDir = . -inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles -runtime_params = warpx.abort_on_warning_threshold=high +inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base +aux1File = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics +runtime_params = FILE=inputs_3d_multiple_particles_test_collider_diagnostics dim = 3 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=3 From b251431c564097f618b2a2d7d556e2b2efb26d0d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 29 Jul 2024 10:59:42 -0700 Subject: [PATCH 012/167] Fix broken test --- Regression/WarpX-tests.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 880bf7b2eda..f864fe148ee 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -146,7 +146,7 @@ analysisRoutine = Examples/analysis_default_regression.py [background_mcc_dp_psp] buildDir = . -inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d +inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d_base runtime_params = warpx.abort_on_warning_threshold = high dim = 2 addToCompileString = From fe1990e1b87a9466b94582c8a7056b8310059cfd Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 30 Jul 2024 13:25:01 -0700 Subject: [PATCH 013/167] Add more tests --- Examples/CMakeLists.txt | 36 ++++++++++++++++ .../Tests/collision/analysis_collision_3d.py | 42 ++++++++----------- .../collision/{inputs_3d => inputs_3d_base} | 0 ...pization => inputs_3d_isotropization_base} | 0 .../collision/{inputs_rz => inputs_rz_base} | 0 Regression/PostProcessingUtils/__init__.py | 0 Regression/WarpX-tests.ini | 7 ++-- 7 files changed, 57 insertions(+), 28 deletions(-) rename Examples/Tests/collision/{inputs_3d => inputs_3d_base} (100%) rename Examples/Tests/collision/{inputs_3d_isotropization => inputs_3d_isotropization_base} (100%) rename Examples/Tests/collision/{inputs_rz => inputs_rz_base} (100%) create mode 100644 Regression/PostProcessingUtils/__init__.py diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index ff4fb3ca522..86e9578b47c 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -229,6 +229,42 @@ add_warpx_test( Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs_test ) +# collisionISO ################################################################ +# +add_warpx_test( + collisionISO # name + 3 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_3d_isotropization_base # inputs_base + Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis + diags/diag1000100 # output +) + +# collisionRZ ################################################################# +# +add_warpx_test( + collisionRZ # name + RZ # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_rz_base # inputs_base + Examples/Tests/collision/analysis_collision_rz.py # analysis + diags/diag1000150 # output +) + +# collisionXYZ ################################################################ +# +add_warpx_test( + collisionXYZ # name + 3 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_3d_base # inputs_base + Examples/Tests/collision/analysis_collision_3d.py # analysis + diags/diag1000150 # output +) + # Langmuir_multi_2d_MR ######################################################## # add_warpx_test( diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index 86a434caab2..c652b0f5231 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -30,9 +30,11 @@ import sys import numpy -import post_processing_utils import yt +sys.path.insert(1, '../../../../warpx/Regression/PostProcessingUtils/') +import post_processing_utils + sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI @@ -55,32 +57,24 @@ b = -0.083851393560288 last_fn = sys.argv[1] -# Remove trailing '/' from file name, if necessary -last_fn.rstrip('/') -# Find last iteration in file name, such as 'test_name_plt000001' (last_it = '000001') -last_it = re.search('\d+', last_fn).group() -# Find output prefix in file name, such as 'test_name_plt000001' (prefix = 'test_name_plt') -prefix = last_fn[:-len(last_it)] -# Collect all output files in fn_list (names match pattern prefix + arbitrary number) -fn_list = glob.glob(prefix + '*[0-9]') +last_it = "000150" error = 0.0 nt = 0 -for fn in fn_list: - # load file - ds = yt.load( fn ) - ad = ds.all_data() - pxe = ad['electron', 'particle_momentum_x'].to_ndarray() - pxi = ad['ion', 'particle_momentum_x'].to_ndarray() - # get time index j - j = int(fn[-5:]) - # compute error - vxe = numpy.mean(pxe)/me/c - vxi = numpy.mean(pxi)/mi/c - vxd = vxe - vxi - fit = a*math.exp(b*j) - error = error + abs(fit-vxd) - nt = nt + 1 +# load file +ds = yt.load( last_fn ) +ad = ds.all_data() +pxe = ad['electron', 'particle_momentum_x'].to_ndarray() +pxi = ad['ion', 'particle_momentum_x'].to_ndarray() +# get time index j +j = int(last_fn[-5:]) +# compute error +vxe = numpy.mean(pxe)/me/c +vxi = numpy.mean(pxi)/mi/c +vxd = vxe - vxi +fit = a*math.exp(b*j) +error = error + abs(fit-vxd) +nt = nt + 1 error = error / nt diff --git a/Examples/Tests/collision/inputs_3d b/Examples/Tests/collision/inputs_3d_base similarity index 100% rename from Examples/Tests/collision/inputs_3d rename to Examples/Tests/collision/inputs_3d_base diff --git a/Examples/Tests/collision/inputs_3d_isotropization b/Examples/Tests/collision/inputs_3d_isotropization_base similarity index 100% rename from Examples/Tests/collision/inputs_3d_isotropization rename to Examples/Tests/collision/inputs_3d_isotropization_base diff --git a/Examples/Tests/collision/inputs_rz b/Examples/Tests/collision/inputs_rz_base similarity index 100% rename from Examples/Tests/collision/inputs_rz rename to Examples/Tests/collision/inputs_rz_base diff --git a/Regression/PostProcessingUtils/__init__.py b/Regression/PostProcessingUtils/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index f864fe148ee..73575ae17a2 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -203,7 +203,7 @@ analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_parti [collisionISO] buildDir = . -inputFile = Examples/Tests/collision/inputs_3d_isotropization +inputFile = Examples/Tests/collision/inputs_3d_isotropization_base runtime_params = dim = 3 addToCompileString = @@ -214,11 +214,10 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py -aux1File = Regression/PostProcessingUtils/post_processing_utils.py [collisionRZ] buildDir = . -inputFile = Examples/Tests/collision/inputs_rz +inputFile = Examples/Tests/collision/inputs_rz_base runtime_params = dim = 2 addToCompileString = USE_RZ=TRUE USE_FFT=FALSE @@ -233,7 +232,7 @@ aux1File = Regression/PostProcessingUtils/post_processing_utils.py [collisionXYZ] buildDir = . -inputFile = Examples/Tests/collision/inputs_3d +inputFile = Examples/Tests/collision/inputs_3d_base runtime_params = dim = 3 addToCompileString = From 14fc9d3593d34be83c368f8db09ec10f5803f4f5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:13:33 +0000 Subject: [PATCH 014/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Examples/Tests/collision/analysis_collision_3d.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index c652b0f5231..86079980f1a 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -23,10 +23,8 @@ # tolerance: 0.001 # Possible running time: ~ 30.0 s -import glob import math import os -import re import sys import numpy From 0524fdc98607c4abe70fcfa271b845a94140d680 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 30 Jul 2024 15:34:13 -0700 Subject: [PATCH 015/167] Fix broken test --- Examples/CMakeLists.txt | 3 +- .../Tests/collision/analysis_collision_3d.py | 41 ++++++++++++------- .../collision/inputs_3d_test_collisionXYZ | 2 + Regression/WarpX-tests.ini | 4 +- 4 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 Examples/Tests/collision/inputs_3d_test_collisionXYZ diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 86e9578b47c..e8906aa4048 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -262,7 +262,8 @@ add_warpx_test( 1 # mpi_np Examples/Tests/collision/inputs_3d_base # inputs_base Examples/Tests/collision/analysis_collision_3d.py # analysis - diags/diag1000150 # output + collisionXYZ_plt000150 # output + Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs_test ) # Langmuir_multi_2d_MR ######################################################## diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index 86079980f1a..46aa8ad8e94 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -23,8 +23,10 @@ # tolerance: 0.001 # Possible running time: ~ 30.0 s +import glob import math import os +import re import sys import numpy @@ -55,24 +57,33 @@ b = -0.083851393560288 last_fn = sys.argv[1] -last_it = "000150" +# Remove trailing '/' from file name, if necessary +last_fn.rstrip('/') +# Find last iteration in file name, such as 'test_name_plt000001' (last_it = '000001') +last_it = re.search('\d+', last_fn).group() +# Find output prefix in file name, such as 'test_name_plt000001' (prefix = 'test_name_plt') +prefix = last_fn[:-len(last_it)] +# Collect all output files in fn_list (names match pattern prefix + arbitrary number) +fn_list = glob.glob(prefix + '*[0-9]') +print(fn_list) error = 0.0 nt = 0 -# load file -ds = yt.load( last_fn ) -ad = ds.all_data() -pxe = ad['electron', 'particle_momentum_x'].to_ndarray() -pxi = ad['ion', 'particle_momentum_x'].to_ndarray() -# get time index j -j = int(last_fn[-5:]) -# compute error -vxe = numpy.mean(pxe)/me/c -vxi = numpy.mean(pxi)/mi/c -vxd = vxe - vxi -fit = a*math.exp(b*j) -error = error + abs(fit-vxd) -nt = nt + 1 +for fn in fn_list: + # load file + ds = yt.load( fn ) + ad = ds.all_data() + pxe = ad['electron', 'particle_momentum_x'].to_ndarray() + pxi = ad['ion', 'particle_momentum_x'].to_ndarray() + # get time index j + j = int(fn[-5:]) + # compute error + vxe = numpy.mean(pxe)/me/c + vxi = numpy.mean(pxi)/mi/c + vxd = vxe - vxi + fit = a*math.exp(b*j) + error = error + abs(fit-vxd) + nt = nt + 1 error = error / nt diff --git a/Examples/Tests/collision/inputs_3d_test_collisionXYZ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ new file mode 100644 index 00000000000..1e46e6a0e0f --- /dev/null +++ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ @@ -0,0 +1,2 @@ +# additional runtime parameters +diag1.file_prefix = collisionXYZ_plt diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 73575ae17a2..03c43100727 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -233,7 +233,9 @@ aux1File = Regression/PostProcessingUtils/post_processing_utils.py [collisionXYZ] buildDir = . inputFile = Examples/Tests/collision/inputs_3d_base -runtime_params = +aux1File = Examples/Tests/collision/inputs_3d_test_collisionXYZ +aux2File = Regression/PostProcessingUtils/post_processing_utils.py +runtime_params = FILE=inputs_3d_test_collisionXYZ dim = 3 addToCompileString = cmakeSetupOpts = -DWarpX_DIMS=3 From d9cb4c8aabc57b828b234fad34cc3ce4428df14d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 31 Jul 2024 11:05:14 -0700 Subject: [PATCH 016/167] Do not enforce backward compatibility - Comment out from WarpX-tests.ini entries related to tests that have been migrated. - WarpX-tests.ini will be deleted at the end of the migration to CTest. --- Examples/CMakeLists.txt | 4 +- Regression/WarpX-tests.ini | 832 +++++++++++++++++-------------------- 2 files changed, 392 insertions(+), 444 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index e8906aa4048..30abeaa0c87 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -178,9 +178,9 @@ add_warpx_test( Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test ) +# FIXME # background_mcc_dp_psp ####################################################### # -# FIXME #add_warpx_test( # background_mcc_dp_psp # name # 2 # dims @@ -453,9 +453,9 @@ if(WarpX_FFT) ) endif() +# FIXME # Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 ##################### # -# FIXME #if(WarpX_FFT) # add_warpx_test( # Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 03c43100727..50cf2578844 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det [AMReX] dir = /home/regtester/AMReX_RegTesting/amrex/ -branch = 0c3273f5e591815909180f8ffaf5b793cabbf9bc +branch = 20e6f2eadf0c297517588ba38973ec7c7084fa31 [source] dir = /home/regtester/AMReX_RegTesting/warpx @@ -69,183 +69,190 @@ cmakeSetupOpts = -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF # individual problems follow -[averaged_galilean_2d_psatd] -buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base -aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd -runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -[averaged_galilean_2d_psatd_hybrid] -buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d_base -aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid -runtime_params = FILE=inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -[averaged_galilean_3d_psatd] -buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d_base -aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd -runtime_params = FILE=inputs_avg_3d_test_averaged_galilean_3d_psatd -dim = 3 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -[averaged_galilean_3d_psatd_hybrid] -buildDir = . -inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d_base -aux1File = Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid -runtime_params = FILE=inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid -dim = 3 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -[background_mcc] -buildDir = . -inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d_base -aux1File = Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc -runtime_params = FILE=inputs_2d_test_background_mcc -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/analysis_default_regression.py - -[background_mcc_dp_psp] -buildDir = . -inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d_base -runtime_params = warpx.abort_on_warning_threshold = high -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_PRECISION=DOUBLE -DWarpX_PARTICLE_PRECISION=SINGLE -DWarpX_QED=OFF -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/analysis_default_regression.py - -[bilinear_filter] -buildDir = . -inputFile = Examples/Tests/single_particle/inputs_2d_base -runtime_params = -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py - -[BTD_rz] -buildDir = . -inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base +#[averaged_galilean_2d_psatd] +#buildDir = . +#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d +#runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +#[averaged_galilean_2d_psatd_hybrid] +#buildDir = . +#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d +#runtime_params = amr.max_grid_size_x=128 amr.max_grid_size_y=64 warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +#[averaged_galilean_3d_psatd] +#buildDir = . +#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d +#runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 3 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +#[averaged_galilean_3d_psatd_hybrid] +#buildDir = . +#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d +#runtime_params = warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 3 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +#[background_mcc] +#buildDir = . +#inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d +#runtime_params = warpx.abort_on_warning_threshold = high +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/analysis_default_regression.py + +#[background_mcc_dp_psp] +#buildDir = . +#inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d +#runtime_params = warpx.abort_on_warning_threshold = high +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_PRECISION=DOUBLE -DWarpX_PARTICLE_PRECISION=SINGLE -DWarpX_QED=OFF +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/analysis_default_regression.py + +#[bilinear_filter] +#buildDir = . +#inputFile = Examples/Tests/single_particle/inputs_2d +#runtime_params = warpx.use_filter=1 warpx.filter_npass_each_dir=1 5 +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py + +#[BTD_rz] +#buildDir = . +#inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD +#runtime_params = +#dim = 2 +#addToCompileString = USE_RZ=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=RZ +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py + +#[collider_diagnostics] +#buildDir = . +#inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles +#runtime_params = warpx.abort_on_warning_threshold=high +#dim = 3 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=3 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py + +[collisionZ] +buildDir = . +inputFile = Examples/Tests/collision/inputs_1d runtime_params = -dim = 2 -addToCompileString = USE_RZ=TRUE -cmakeSetupOpts = -DWarpX_DIMS=RZ -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py - -[collider_diagnostics] -buildDir = . -inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base -aux1File = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics -runtime_params = FILE=inputs_3d_multiple_particles_test_collider_diagnostics -dim = 3 +dim = 1 addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=3 +cmakeSetupOpts = -DWarpX_DIMS=1 restartTest = 0 useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py - -[collisionISO] -buildDir = . -inputFile = Examples/Tests/collision/inputs_3d_isotropization_base -runtime_params = -dim = 3 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=3 -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py - -[collisionRZ] -buildDir = . -inputFile = Examples/Tests/collision/inputs_rz_base -runtime_params = -dim = 2 -addToCompileString = USE_RZ=TRUE USE_FFT=FALSE -cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_FFT=OFF -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/collision/analysis_collision_rz.py -aux1File = Regression/PostProcessingUtils/post_processing_utils.py - -[collisionXYZ] -buildDir = . -inputFile = Examples/Tests/collision/inputs_3d_base -aux1File = Examples/Tests/collision/inputs_3d_test_collisionXYZ -aux2File = Regression/PostProcessingUtils/post_processing_utils.py -runtime_params = FILE=inputs_3d_test_collisionXYZ -dim = 3 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=3 -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/collision/analysis_collision_3d.py -aux1File = Regression/PostProcessingUtils/post_processing_utils.py +analysisRoutine = Examples/Tests/collision/analysis_collision_1d.py + +#[collisionISO] +#buildDir = . +#inputFile = Examples/Tests/collision/inputs_3d_isotropization +#runtime_params = +#dim = 3 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=3 +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py +#aux1File = Regression/PostProcessingUtils/post_processing_utils.py + +#[collisionRZ] +#buildDir = . +#inputFile = Examples/Tests/collision/inputs_rz +#runtime_params = +#dim = 2 +#addToCompileString = USE_RZ=TRUE USE_FFT=FALSE +#cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_FFT=OFF +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/collision/analysis_collision_rz.py +#aux1File = Regression/PostProcessingUtils/post_processing_utils.py + +#[collisionXYZ] +#buildDir = . +#inputFile = Examples/Tests/collision/inputs_3d +#runtime_params = +#dim = 3 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=3 +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/collision/analysis_collision_3d.py +#aux1File = Regression/PostProcessingUtils/post_processing_utils.py [collisionXZ] buildDir = . @@ -373,7 +380,6 @@ useOMP = 1 numthreads = 1 runtime_params = geometry.dims=2 analysisRoutine = Examples/Tests/dive_cleaning/analysis.py -analysisOutputImage = Comparison.png [dive_cleaning_3d] buildDir = . @@ -388,7 +394,6 @@ useOMP = 1 numthreads = 1 runtime_params = analysisRoutine = Examples/Tests/dive_cleaning/analysis.py -analysisOutputImage = Comparison.png [ElectrostaticSphere] buildDir = . @@ -478,7 +483,7 @@ analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis_rz.py [ElectrostaticSphereEB_RZ_MR] buildDir = . inputFile = Examples/Tests/electrostatic_sphere_eb/inputs_rz_mr -runtime_params = warpx.abort_on_warning_threshold = medium +runtime_params = warpx.abort_on_warning_threshold = medium amr.ref_ratio_vect = 2 2 2 dim = 2 addToCompileString = USE_EB=TRUE USE_RZ=TRUE cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_EB=ON @@ -487,7 +492,8 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis_rz.py +outputFile = ElectrostaticSphereEB_RZ_MR_plt +analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py [ElectrostaticSphereLabFrame] buildDir = . @@ -939,7 +945,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_fluid_1D] buildDir = . @@ -954,7 +959,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_1d.py -analysisOutputImage = langmuir_fluid_multi_1d_analysis.png [Langmuir_fluid_RZ] buildDir = . @@ -969,7 +973,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_rz.py -analysisOutputImage = langmuir_fluid_rz_analysis.png [Langmuir_fluid_2D] buildDir = . @@ -984,7 +987,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_2d.py -analysisOutputImage = langmuir_fluid_multi_2d_analysis.png [Langmuir_fluid_multi] buildDir = . @@ -999,7 +1001,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_3d.py -analysisOutputImage = langmuir_fluid_multi_analysis.png [Langmuir_multi_1d] buildDir = . @@ -1014,247 +1015,216 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_1d.py -analysisOutputImage = langmuir_multi_1d_analysis.png -[Langmuir_multi_2d_MR] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_MR.png - -[Langmuir_multi_2d_MR_anisotropic] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_anisotropic -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_MR.png - -[Langmuir_multi_2d_MR_momentum_conserving] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_MR_momentum_conserving.png - -[Langmuir_multi_2d_MR_psatd] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_MR_psatd -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_MR_psatd.png - -[Langmuir_multi_2d_nodal] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_nodal -dim = 2 -addToCompileString = -cmakeSetupOpts = -DWarpX_DIMS=2 -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_current_correction] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_current_correction -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_current_correction_nodal] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_momentum_conserving] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_multiJ] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_multiJ -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png - -[Langmuir_multi_2d_psatd_multiJ_nodal] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png - -[Langmuir_multi_2d_psatd_nodal] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_nodal -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 2 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_Vay_deposition] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png - -[Langmuir_multi_2d_psatd_Vay_deposition_nodal] -buildDir = . -inputFile = Examples/Tests/langmuir/inputs_2d_base -aux1File = Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal -runtime_params = FILE=inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal -dim = 2 -addToCompileString = USE_FFT=TRUE -cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -restartTest = 0 -useMPI = 1 -numprocs = 1 -useOMP = 1 -numthreads = 1 -analysisRoutine = Examples/Tests/langmuir/analysis_2d.py -analysisOutputImage = langmuir_multi_2d_analysis.png +#[Langmuir_multi_2d_MR] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_MR_anisotropic] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_MR_momentum_conserving] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_MR_psatd] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_nodal] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +#dim = 2 +#addToCompileString = +#cmakeSetupOpts = -DWarpX_DIMS=2 +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_current_correction] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_current_correction_nodal] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_momentum_conserving] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_multiJ] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_multiJ_nodal] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_nodal] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 2 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_Vay_deposition] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +#[Langmuir_multi_2d_psatd_Vay_deposition_nodal] +#buildDir = . +#inputFile = Examples/Tests/langmuir/inputs_2d +#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +#dim = 2 +#addToCompileString = USE_FFT=TRUE +#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +#restartTest = 0 +#useMPI = 1 +#numprocs = 1 +#useOMP = 1 +#numthreads = 1 +#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py [Langmuir_multi_nodal] buildDir = . @@ -1269,7 +1239,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd] buildDir = . @@ -1284,7 +1253,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_current_correction] buildDir = . @@ -1299,7 +1267,6 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_current_correction_nodal] buildDir = . @@ -1314,7 +1281,6 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_div_cleaning] buildDir = . @@ -1329,7 +1295,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_momentum_conserving] buildDir = . @@ -1344,7 +1309,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_multiJ] buildDir = . @@ -1359,7 +1323,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = Langmuir_multi_psatd_multiJ.png [Langmuir_multi_psatd_multiJ_nodal] buildDir = . @@ -1374,7 +1337,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = Langmuir_multi_psatd_multiJ_nodal.png [Langmuir_multi_psatd_nodal] buildDir = . @@ -1389,7 +1351,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_single_precision] buildDir = . @@ -1404,7 +1365,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_Vay_deposition] buildDir = . @@ -1419,7 +1379,6 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_psatd_Vay_deposition_nodal] buildDir = . @@ -1434,7 +1393,6 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Langmuir_multi_rz] buildDir = . @@ -1449,7 +1407,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_rz.py -analysisOutputImage = Langmuir_multi_rz_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py [Langmuir_multi_rz_psatd] @@ -1465,7 +1422,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_rz.py -analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py [Langmuir_multi_rz_psatd_current_correction] @@ -1481,7 +1437,6 @@ numprocs = 1 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_rz.py -analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py [Langmuir_multi_rz_psatd_multiJ] @@ -1497,7 +1452,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_rz.py -analysisOutputImage = Langmuir_multi_rz_psatd_multiJ_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py [Langmuir_multi_single_precision] @@ -1513,7 +1467,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_3d.py -analysisOutputImage = langmuir_multi_analysis.png [Larmor] buildDir = . @@ -1685,7 +1638,6 @@ numprocs = 2 useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/laser_injection/analysis_laser.py -analysisOutputImage = laser_analysis.png [LaserInjection_1d] buildDir = . @@ -3495,7 +3447,6 @@ useOMP = 1 numthreads = 1 runtime_params = analysisRoutine = Examples/Tests/relativistic_space_charge_initialization/analysis.py -analysisOutputImage = Comparison.png [RepellingParticles] buildDir = . @@ -3709,7 +3660,6 @@ useOMP = 1 numthreads = 1 runtime_params = analysisRoutine = Examples/Tests/space_charge_initialization/analysis.py -analysisOutputImage = Comparison.png [space_charge_initialization_2d] buildDir = . @@ -3724,7 +3674,6 @@ useOMP = 1 numthreads = 1 runtime_params = geometry.dims=2 analysisRoutine = Examples/Tests/space_charge_initialization/analysis.py -analysisOutputImage = Comparison.png [subcyclingMR] buildDir = . @@ -3856,7 +3805,6 @@ useOMP = 1 numthreads = 1 outputFile = spacecraft_charging_plt analysisRoutine = Examples/Physics_applications/spacecraft_charging/analysis.py -analysisOutputImage = min_phi_analysis.png [Point_of_contact_EB_3d] buildDir = . From 3660b917134cefb9db1d5310cbcfd739cf0275bc Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 31 Jul 2024 11:34:52 -0700 Subject: [PATCH 017/167] Testing Azure pipeline --- .azure-pipelines.yml | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 7e4edc2dc36..d061d876ce1 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -20,8 +20,9 @@ jobs: WARPX_CI_CCACHE: 'TRUE' WARPX_CI_NUM_MAKE_JOBS: 2 WARPX_CI_OPENPMD: 'TRUE' - WARPX_CI_TMP: '/tmp/ci' + #WARPX_CI_TMP: '/tmp/ci' + # FIXME strategy: matrix: cartesian1d: @@ -31,14 +32,14 @@ jobs: WARPX_CI_REGULAR_CARTESIAN_2D: 'TRUE' cartesian3d: WARPX_CI_REGULAR_CARTESIAN_3D: 'TRUE' - single_precision: - WARPX_CI_SINGLE_PRECISION: 'TRUE' + #single_precision: + # WARPX_CI_SINGLE_PRECISION: 'TRUE' rz_or_nompi: WARPX_CI_RZ_OR_NOMPI: 'TRUE' - qed: - WARPX_CI_QED: 'TRUE' - embedded_boundary: - WARPX_CI_EB: 'TRUE' + #qed: + # WARPX_CI_QED: 'TRUE' + #embedded_boundary: + # WARPX_CI_EB: 'TRUE' # default: 60; maximum: 360 timeoutInMinutes: 240 @@ -109,6 +110,7 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi + python3 -m pip install --upgrade yt rm -rf ${CEI_TMP} df -h displayName: 'Install dependencies' @@ -116,7 +118,25 @@ jobs: - bash: | set -eu -o pipefail df -h - ./run_test.sh - rm -rf ${WARPX_CI_TMP} + #./run_test.sh + # configure build + # - cartesian1d + if [ "${WARPX_CI_REGULAR_CARTESIAN_1D:-FALSE}" == "TRUE" ]; then + cmake -DWarpX_DIMS=1 -DAMReX_SPACEDIM=1 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build + # - cartesian2d + elif [ "${WARPX_CI_REGULAR_CARTESIAN_2D:-FALSE}" == "TRUE" ]; then + cmake -DWarpX_DIMS=2 -DAMReX_SPACEDIM=2 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build + # - cartesian3d + elif [ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]; then + cmake -DWarpX_DIMS=3 -DWarpX_OPENPMD=ON -DAMReX_SPACEDIM=3 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build + # - rz_or_nompi + elif [ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]; then + cmake -DWarpX_DIMS=RZ -DAMReX_SPACEDIM=2 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build + fi + # build + cmake --build build -j 2 + # run tests + ctest --test-dir build --output-on-failure + #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' From b9669f96f40f27fd6fc40cc01618de51e4fa21e0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 31 Jul 2024 14:56:11 -0700 Subject: [PATCH 018/167] Azure Update --- .azure-pipelines.yml | 51 +++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d061d876ce1..397bf212832 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -26,20 +26,19 @@ jobs: strategy: matrix: cartesian1d: - WARPX_CI_REGULAR_CARTESIAN_1D: 'TRUE' - WARPX_CI_PSATD: 'FALSE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' cartesian2d: - WARPX_CI_REGULAR_CARTESIAN_2D: 'TRUE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' cartesian3d: - WARPX_CI_REGULAR_CARTESIAN_3D: 'TRUE' - #single_precision: - # WARPX_CI_SINGLE_PRECISION: 'TRUE' - rz_or_nompi: - WARPX_CI_RZ_OR_NOMPI: 'TRUE' - #qed: - # WARPX_CI_QED: 'TRUE' - #embedded_boundary: - # WARPX_CI_EB: 'TRUE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' + rz: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' + single_precision: + WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' + nompi: + WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' + embedded_boundary: + WARPX_CMAKE_FLAGS: -DWarpX_EB='ON' # default: 60; maximum: 360 timeoutInMinutes: 240 @@ -51,9 +50,8 @@ jobs: - task: Cache@2 continueOnError: true inputs: - key: 'Ccache | "$(System.JobName)" | .azure-pipelines.yml | cmake/dependencies/AMReX.cmake | run_test.sh' + key: 'Ccache | "$(System.JobName)" | .azure-pipelines.yml | cmake/dependencies/AMReX.cmake' restoreKeys: | - Ccache | "$(System.JobName)" | .azure-pipelines.yml | cmake/dependencies/AMReX.cmake | run_test.sh Ccache | "$(System.JobName)" | .azure-pipelines.yml | cmake/dependencies/AMReX.cmake Ccache | "$(System.JobName)" | .azure-pipelines.yml path: /home/vsts/.ccache @@ -63,9 +61,8 @@ jobs: - task: Cache@2 continueOnError: true inputs: - key: 'Python3 | "$(System.JobName)" | .azure-pipelines.yml | run_test.sh' + key: 'Python3 | "$(System.JobName)" | .azure-pipelines.yml' restoreKeys: | - Python3 | "$(System.JobName)" | .azure-pipelines.yml | run_test.sh Python3 | "$(System.JobName)" | .azure-pipelines.yml path: /home/vsts/.local/lib/python3.8 cacheHitVar: PYTHON38_CACHE_RESTORED @@ -118,25 +115,17 @@ jobs: - bash: | set -eu -o pipefail df -h - #./run_test.sh - # configure build - # - cartesian1d - if [ "${WARPX_CI_REGULAR_CARTESIAN_1D:-FALSE}" == "TRUE" ]; then - cmake -DWarpX_DIMS=1 -DAMReX_SPACEDIM=1 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build - # - cartesian2d - elif [ "${WARPX_CI_REGULAR_CARTESIAN_2D:-FALSE}" == "TRUE" ]; then - cmake -DWarpX_DIMS=2 -DAMReX_SPACEDIM=2 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build - # - cartesian3d - elif [ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]; then - cmake -DWarpX_DIMS=3 -DWarpX_OPENPMD=ON -DAMReX_SPACEDIM=3 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build - # - rz_or_nompi - elif [ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]; then - cmake -DWarpX_DIMS=RZ -DAMReX_SPACEDIM=2 -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF -DpyAMReX_IPO=OFF -S . -B build - fi + + # configure + cmake \ + -S . \ + -B build \ + ${WARPX_CMAKE_FLAGS} # build cmake --build build -j 2 # run tests ctest --test-dir build --output-on-failure + #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' From 57b414ac94ddcd05e9302f071ed0d80f9b895dcd Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 31 Jul 2024 15:07:48 -0700 Subject: [PATCH 019/167] Tests: Individual CMakeLists.txt per test Less collisions as people expand tests. --- Examples/CMakeLists.txt | 15 ++------------- Examples/Physics_applications/CMakeLists.txt | 4 ++++ .../capacitive_discharge/CMakeLists.txt | 10 ++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 Examples/Physics_applications/CMakeLists.txt create mode 100644 Examples/Physics_applications/capacitive_discharge/CMakeLists.txt diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 30abeaa0c87..263b34ed2f5 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -105,6 +105,8 @@ endfunction() # Add tests (alphabetical order) ############################################## # +add_subdirectory(Physics_applications) + # averaged_galilean_2d_psatd ################################################## # if(WarpX_FFT) @@ -165,19 +167,6 @@ if(WarpX_FFT) ) endif() -# background_mcc ############################################################## -# -add_warpx_test( - background_mcc # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base - Examples/analysis_default_regression.py # analysis - diags/diag1000050 # output - Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test -) - # FIXME # background_mcc_dp_psp ####################################################### # diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt new file mode 100644 index 00000000000..ef9ca2e2294 --- /dev/null +++ b/Examples/Physics_applications/CMakeLists.txt @@ -0,0 +1,4 @@ +# Add tests (alphabetical order) ############################################## +# + +add_subdirectory(capacitive_discharge) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt new file mode 100644 index 00000000000..316881f05b6 --- /dev/null +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -0,0 +1,10 @@ +add_warpx_test( + background_mcc # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base + Examples/analysis_default_regression.py # analysis + diags/diag1000050 # output + Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test +) From ef10e0db85063525b8cdfc99c38f1e6f273a346c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 31 Jul 2024 15:30:59 -0700 Subject: [PATCH 020/167] CI: CTest `registered_tests` Script Updates to search for `add_warpx_test` registration locations. --- .github/workflows/source/inputsNotTested | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/source/inputsNotTested b/.github/workflows/source/inputsNotTested index 497d322a610..1b2df281022 100755 --- a/.github/workflows/source/inputsNotTested +++ b/.github/workflows/source/inputsNotTested @@ -6,6 +6,10 @@ set -eu -o pipefail ok=0 +# all calls to add_warpx_test(...) in CMakeLists.txt files +registered_tests=$(grep -h -R -A5 "add_warpx_test" Examples/ | grep Examples) + +# go through each input file: C++ inputs or PICMI Python for file in $(find Examples -type f) do # Name of file without path @@ -17,9 +21,7 @@ do cr=$'$' file_cr="$file$cr" # Search file name in test list - string_match=$(grep -m1 "$file_cr" Regression/WarpX-tests.ini || echo "") - # If match is empty, inputs examples is not tested - if [[ -z $string_match ]] + if [[ "${registered_tests,,}" != *"${file_cr}"* ]] then echo "$file is not tested!" ok=1 From ce82a8cea71179e79cbfe7555d11df678abe94e8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 31 Jul 2024 16:35:58 -0700 Subject: [PATCH 021/167] Individual CMakeLists.txt per test --- Examples/CMakeLists.txt | 367 +----------------- .../capacitive_discharge/CMakeLists.txt | 17 + Examples/Tests/CMakeLists.txt | 9 + Examples/Tests/btd_rz/CMakeLists.txt | 14 + .../collider_relevant_diags/CMakeLists.txt | 15 + Examples/Tests/collision/CMakeLists.txt | 39 ++ Examples/Tests/langmuir/CMakeLists.txt | 221 +++++++++++ .../Tests/nci_psatd_stability/CMakeLists.txt | 62 +++ Examples/Tests/single_particle/CMakeLists.txt | 14 + 9 files changed, 392 insertions(+), 366 deletions(-) create mode 100644 Examples/Tests/CMakeLists.txt create mode 100644 Examples/Tests/btd_rz/CMakeLists.txt create mode 100644 Examples/Tests/collider_relevant_diags/CMakeLists.txt create mode 100644 Examples/Tests/collision/CMakeLists.txt create mode 100644 Examples/Tests/langmuir/CMakeLists.txt create mode 100644 Examples/Tests/nci_psatd_stability/CMakeLists.txt create mode 100644 Examples/Tests/single_particle/CMakeLists.txt diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 263b34ed2f5..b3eef21564a 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -105,370 +105,5 @@ endfunction() # Add tests (alphabetical order) ############################################## # +add_subdirectory(Tests) add_subdirectory(Physics_applications) - -# averaged_galilean_2d_psatd ################################################## -# -if(WarpX_FFT) - add_warpx_test( - averaged_galilean_2d_psatd # name - 2 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis - diags/diag1000400 # output - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test - ) -endif() - -# averaged_galilean_2d_psatd_hybrid ########################################### -# -if(WarpX_FFT) - add_warpx_test( - averaged_galilean_2d_psatd_hybrid # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis - diags/diag1000400 # output - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test - ) -endif() - -# averaged_galilean_3d_psatd ################################################## -# -if(WarpX_FFT) - add_warpx_test( - averaged_galilean_3d_psatd # name - 3 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis - diags/diag1000160 # output - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test - ) -endif() - -# averaged_galilean_3d_psatd_hybrid ########################################### -# -if(WarpX_FFT) - add_warpx_test( - averaged_galilean_3d_psatd_hybrid # name - 3 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis - diags/diag1000160 # output - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test - ) -endif() - -# FIXME -# background_mcc_dp_psp ####################################################### -# -#add_warpx_test( -# background_mcc_dp_psp # name -# 2 # dims -# ON # mpi -# 2 # mpi_np -# Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base -# Examples/analysis_default_regression.py # analysis -# diags/diag1000050 # output -# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs_test -#) - -# bilinear_filter ############################################################# -# -add_warpx_test( - bilinear_filter # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/single_particle/inputs_2d_base # inputs_base - Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis - diags/diag1000001 # output -) - -# BTD_rz ###################################################################### -# -add_warpx_test( - BTD_rz # name - RZ # dims - ON # mpi - 2 # mpi_np - Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs_base - Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis - diags/diag1000289 # output -) - -# collider_diagnostics ######################################################## -# -add_warpx_test( - collider_diagnostics # name - 3 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base # inputs_base - Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis - diags/diag1000001 # output - Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs_test -) - -# collisionISO ################################################################ -# -add_warpx_test( - collisionISO # name - 3 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/collision/inputs_3d_isotropization_base # inputs_base - Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis - diags/diag1000100 # output -) - -# collisionRZ ################################################################# -# -add_warpx_test( - collisionRZ # name - RZ # dims - ON # mpi - 1 # mpi_np - Examples/Tests/collision/inputs_rz_base # inputs_base - Examples/Tests/collision/analysis_collision_rz.py # analysis - diags/diag1000150 # output -) - -# collisionXYZ ################################################################ -# -add_warpx_test( - collisionXYZ # name - 3 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/collision/inputs_3d_base # inputs_base - Examples/Tests/collision/analysis_collision_3d.py # analysis - collisionXYZ_plt000150 # output - Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs_test -) - -# Langmuir_multi_2d_MR ######################################################## -# -add_warpx_test( - Langmuir_multi_2d_MR # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test -) - -# Langmuir_multi_2d_MR_anisotropic ############################################ -# -add_warpx_test( - Langmuir_multi_2d_MR_anisotropic # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test -) - -# Langmuir_multi_2d_MR_momentum_conserving #################################### -# -add_warpx_test( - Langmuir_multi_2d_MR_momentum_conserving # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test -) - -# Langmuir_multi_2d_MR_psatd ################################################## -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_MR_psatd # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test - ) -endif() - -# Langmuir_multi_2d_nodal ##################################################### -# -add_warpx_test( - Langmuir_multi_2d_nodal # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test -) - -# Langmuir_multi_2d_psatd ##################################################### -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_current_correction ################################## -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_current_correction # name - 2 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_current_correction_nodal ############################ -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_current_correction_nodal # name - 2 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_momentum_conserving ################################# -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_momentum_conserving # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_multiJ ############################################## -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_multiJ # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_multiJ_nodal ######################################## -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_multiJ_nodal # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_nodal ############################################### -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_nodal # name - 2 # dims - ON # mpi - 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test - ) -endif() - -# Langmuir_multi_2d_psatd_Vay_deposition ###################################### -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_Vay_deposition # name - 2 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test - ) -endif() - -# FIXME -# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 ##################### -# -#if(WarpX_FFT) -# add_warpx_test( -# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name -# 2 # dims -# ON # mpi -# 1 # mpi_np -# Examples/Tests/langmuir/inputs_2d_base # inputs_base -# Examples/Tests/langmuir/analysis_2d.py # analysis -# diags/diag1000080 # output -# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test -# ) -#endif() - -# Langmuir_multi_2d_psatd_Vay_deposition_nodal ################################ -# -if(WarpX_FFT) - add_warpx_test( - Langmuir_multi_2d_psatd_Vay_deposition_nodal # name - 2 # dims - ON # mpi - 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base - Examples/Tests/langmuir/analysis_2d.py # analysis - diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test - ) -endif() diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 316881f05b6..18d4f806a6c 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -1,3 +1,6 @@ +# Add tests (alphabetical order) ############################################## +# + add_warpx_test( background_mcc # name 2 # dims @@ -8,3 +11,17 @@ add_warpx_test( diags/diag1000050 # output Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test ) + +# FIXME +# background_mcc_dp_psp ####################################################### +# +#add_warpx_test( +# background_mcc_dp_psp # name +# 2 # dims +# ON # mpi +# 2 # mpi_np +# Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base +# Examples/analysis_default_regression.py # analysis +# diags/diag1000050 # output +# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs_test +#) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt new file mode 100644 index 00000000000..42cbebe7f1c --- /dev/null +++ b/Examples/Tests/CMakeLists.txt @@ -0,0 +1,9 @@ +# Add tests (alphabetical order) ############################################## +# + +add_subdirectory(btd_rz) +add_subdirectory(collider_relevant_diags) +add_subdirectory(collision) +add_subdirectory(langmuir) +add_subdirectory(nci_psatd_stability) +add_subdirectory(single_particle) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt new file mode 100644 index 00000000000..142f4c8677d --- /dev/null +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# BTD_rz ###################################################################### +# +add_warpx_test( + BTD_rz # name + RZ # dims + ON # mpi + 2 # mpi_np + Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs_base + Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis + diags/diag1000289 # output +) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt new file mode 100644 index 00000000000..aee7eb8692e --- /dev/null +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -0,0 +1,15 @@ +# Add tests (alphabetical order) ############################################## +# + +# collider_diagnostics ######################################################## +# +add_warpx_test( + collider_diagnostics # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base # inputs_base + Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis + diags/diag1000001 # output + Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs_test +) diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt new file mode 100644 index 00000000000..84f58f0677c --- /dev/null +++ b/Examples/Tests/collision/CMakeLists.txt @@ -0,0 +1,39 @@ +# Add tests (alphabetical order) ############################################## +# + +# collisionISO ################################################################ +# +add_warpx_test( + collisionISO # name + 3 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_3d_isotropization_base # inputs_base + Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis + diags/diag1000100 # output +) + +# collisionRZ ################################################################# +# +add_warpx_test( + collisionRZ # name + RZ # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_rz_base # inputs_base + Examples/Tests/collision/analysis_collision_rz.py # analysis + diags/diag1000150 # output +) + +# collisionXYZ ################################################################ +# +add_warpx_test( + collisionXYZ # name + 3 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/collision/inputs_3d_base # inputs_base + Examples/Tests/collision/analysis_collision_3d.py # analysis + collisionXYZ_plt000150 # output + Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs_test +) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt new file mode 100644 index 00000000000..8f8c095b299 --- /dev/null +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -0,0 +1,221 @@ +# Add tests (alphabetical order) ############################################## +# + +# Langmuir_multi_2d_MR ######################################################## +# +add_warpx_test( + Langmuir_multi_2d_MR # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test +) + +# Langmuir_multi_2d_MR_anisotropic ############################################ +# +add_warpx_test( + Langmuir_multi_2d_MR_anisotropic # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test +) + +# Langmuir_multi_2d_MR_momentum_conserving #################################### +# +add_warpx_test( + Langmuir_multi_2d_MR_momentum_conserving # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test +) + +# Langmuir_multi_2d_MR_psatd ################################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_MR_psatd # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test + ) +endif() + +# Langmuir_multi_2d_nodal ##################################################### +# +add_warpx_test( + Langmuir_multi_2d_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test +) + + +# Langmuir_multi_2d_psatd ##################################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_current_correction ################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_current_correction # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_current_correction_nodal ############################ +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_current_correction_nodal # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_momentum_conserving ################################# +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_momentum_conserving # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_multiJ ############################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_multiJ # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_multiJ_nodal ######################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_multiJ_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_nodal ############################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_nodal # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test + ) +endif() + +# Langmuir_multi_2d_psatd_Vay_deposition ###################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_Vay_deposition # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test + ) +endif() + +# FIXME +# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 ##################### +# +#if(WarpX_FFT) +# add_warpx_test( +# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name +# 2 # dims +# ON # mpi +# 1 # mpi_np +# Examples/Tests/langmuir/inputs_2d_base # inputs_base +# Examples/Tests/langmuir/analysis_2d.py # analysis +# diags/diag1000080 # output +# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test +# ) +#endif() + +# Langmuir_multi_2d_psatd_Vay_deposition_nodal ################################ +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_2d_psatd_Vay_deposition_nodal # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt new file mode 100644 index 00000000000..b69fc586585 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -0,0 +1,62 @@ +# Add tests (alphabetical order) ############################################## +# + +# averaged_galilean_2d_psatd ################################################## +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_2d_psatd # name + 2 # dims + ON # mpi + 1 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test + ) +endif() + +# averaged_galilean_2d_psatd_hybrid ########################################### +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_2d_psatd_hybrid # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test + ) +endif() + +# averaged_galilean_3d_psatd ################################################## +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_3d_psatd # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000160 # output + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test + ) +endif() + +# averaged_galilean_3d_psatd_hybrid ########################################### +# +if(WarpX_FFT) + add_warpx_test( + averaged_galilean_3d_psatd_hybrid # name + 3 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000160 # output + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test + ) +endif() diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt new file mode 100644 index 00000000000..3963f0ac53a --- /dev/null +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# bilinear_filter ############################################################# +# +add_warpx_test( + bilinear_filter # name + 2 # dims + ON # mpi + 2 # mpi_np + Examples/Tests/single_particle/inputs_2d_base # inputs_base + Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis + diags/diag1000001 # output +) From f7aa26108cc3024b49dd997fc8058de4d090ae4b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 31 Jul 2024 16:51:18 -0700 Subject: [PATCH 022/167] Cleanup --- .azure-pipelines.yml | 11 +++-------- Examples/Tests/collision/analysis_collision_3d.py | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 397bf212832..747b16beb46 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: WARPX_CI_CCACHE: 'TRUE' WARPX_CI_NUM_MAKE_JOBS: 2 WARPX_CI_OPENPMD: 'TRUE' - #WARPX_CI_TMP: '/tmp/ci' + WARPX_CI_TMP: '/tmp/ci' # FIXME strategy: @@ -115,17 +115,12 @@ jobs: - bash: | set -eu -o pipefail df -h - # configure - cmake \ - -S . \ - -B build \ - ${WARPX_CMAKE_FLAGS} + cmake -S . -B build ${WARPX_CMAKE_FLAGS} # build cmake --build build -j 2 # run tests ctest --test-dir build --output-on-failure - - #rm -rf ${WARPX_CI_TMP} + rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index 46aa8ad8e94..e988f6fa4d4 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -65,7 +65,6 @@ prefix = last_fn[:-len(last_it)] # Collect all output files in fn_list (names match pattern prefix + arbitrary number) fn_list = glob.glob(prefix + '*[0-9]') -print(fn_list) error = 0.0 nt = 0 From 78afd77b70535ec57909470037655357244205ec Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 31 Jul 2024 18:34:27 -0700 Subject: [PATCH 023/167] Change interface of `add_warpx_test` --- Examples/CMakeLists.txt | 21 +++++---- .../capacitive_discharge/CMakeLists.txt | 6 +-- .../inputs_2d_test_background_mcc | 5 ++- Examples/Tests/btd_rz/CMakeLists.txt | 2 +- .../collider_relevant_diags/CMakeLists.txt | 3 +- ...ltiple_particles_test_collider_diagnostics | 5 ++- Examples/Tests/collision/CMakeLists.txt | 7 ++- .../collision/inputs_3d_test_collisionXYZ | 5 ++- Examples/Tests/langmuir/CMakeLists.txt | 45 +++++++------------ .../inputs_2d_test_Langmuir_multi_2d_MR | 5 ++- ...s_2d_test_Langmuir_multi_2d_MR_anisotropic | 5 ++- ...t_Langmuir_multi_2d_MR_momentum_conserving | 5 ++- .../inputs_2d_test_Langmuir_multi_2d_MR_psatd | 5 ++- .../inputs_2d_test_Langmuir_multi_2d_nodal | 5 ++- .../inputs_2d_test_Langmuir_multi_2d_psatd | 5 ++- ...est_Langmuir_multi_2d_psatd_Vay_deposition | 5 ++- ...ngmuir_multi_2d_psatd_Vay_deposition_nodal | 5 ++- ...i_2d_psatd_Vay_deposition_particle_shape_4 | 5 ++- ...Langmuir_multi_2d_psatd_current_correction | 5 ++- ...ir_multi_2d_psatd_current_correction_nodal | 5 ++- ...angmuir_multi_2d_psatd_momentum_conserving | 5 ++- ...uts_2d_test_Langmuir_multi_2d_psatd_multiJ | 5 ++- ..._test_Langmuir_multi_2d_psatd_multiJ_nodal | 5 ++- ...puts_2d_test_Langmuir_multi_2d_psatd_nodal | 5 ++- .../Tests/nci_psatd_stability/CMakeLists.txt | 12 ++--- ...uts_avg_2d_test_averaged_galilean_2d_psatd | 5 ++- ..._2d_test_averaged_galilean_2d_psatd_hybrid | 5 ++- ...uts_avg_3d_test_averaged_galilean_3d_psatd | 5 ++- ..._3d_test_averaged_galilean_3d_psatd_hybrid | 5 ++- Examples/Tests/single_particle/CMakeLists.txt | 2 +- 30 files changed, 125 insertions(+), 83 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index b3eef21564a..fc5068aba2c 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -22,10 +22,9 @@ function(add_warpx_test dims mpi mpi_np - inputs_base + inputs analysis output - #inputs_test (optional) ) # cannot run MPI tests w/o MPI support if(mpi AND NOT WarpX_MPI) @@ -43,6 +42,12 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) + # copy local input files to run directory + get_filename_component(INPUTS_PATH ${inputs} REALPATH BASE_DIR "${CMAKE_BINARYDIR}") + get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) + file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*") + file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) + set(THIS_MPI_TEST_EXE) if(mpi) set(THIS_MPI_TEST_EXE @@ -54,6 +59,7 @@ function(add_warpx_test ) endif() + # FIXME set(runtime_params "amrex.abort_on_unused_inputs = 1" "amrex.fpe_trap_invalid = 1" @@ -61,25 +67,18 @@ function(add_warpx_test "amrex.fpe_trap_zero = 1" "amrex.throw_exception = 1" "warpx.always_warn_immediately = 1" - "warpx.abort_on_warning_threshold = low" + #"warpx.abort_on_warning_threshold = low" "warpx.do_dynamic_scheduling = 0" "warpx.serialize_initial_conditions = 1" ) - # FILE parameter must be at the end, - # to possibly overwrite previous inputs - # FIXME Avoid magic numbers - if(${ARGC} GREATER 7) - list(APPEND runtime_params "FILE = ${WarpX_SOURCE_DIR}/${ARGV7}") - endif() - # test run add_test( NAME ${name}.run COMMAND ${THIS_MPI_TEST_EXE} $ - ${WarpX_SOURCE_DIR}/${inputs_base} + ${WarpX_SOURCE_DIR}/${inputs} ${runtime_params} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 18d4f806a6c..ff4ce6db61a 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -6,10 +6,9 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base + Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output - Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs_test ) # FIXME @@ -20,8 +19,7 @@ add_warpx_test( # 2 # dims # ON # mpi # 2 # mpi_np -# Examples/Physics_applications/capacitive_discharge/inputs_2d_base # inputs_base +# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output -# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs_test #) diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc index 8a0011c98ad..d143741d2ab 100644 --- a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc +++ b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc @@ -1,2 +1,5 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters warpx.abort_on_warning_threshold = high diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 142f4c8677d..ef87ea988c8 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -8,7 +8,7 @@ add_warpx_test( RZ # dims ON # mpi 2 # mpi_np - Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs_base + Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output ) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index aee7eb8692e..1becbf86253 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -8,8 +8,7 @@ add_warpx_test( 3 # dims ON # mpi 2 # mpi_np - Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base # inputs_base + Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis diags/diag1000001 # output - Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs_test ) diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics index 8a0011c98ad..595b05db24f 100644 --- a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics +++ b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics @@ -1,2 +1,5 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_3d_multiple_particles_base + +# test input parameters warpx.abort_on_warning_threshold = high diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 84f58f0677c..9d6b64a3b99 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -8,7 +8,7 @@ add_warpx_test( 3 # dims ON # mpi 1 # mpi_np - Examples/Tests/collision/inputs_3d_isotropization_base # inputs_base + Examples/Tests/collision/inputs_3d_isotropization_base # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output ) @@ -20,7 +20,7 @@ add_warpx_test( RZ # dims ON # mpi 1 # mpi_np - Examples/Tests/collision/inputs_rz_base # inputs_base + Examples/Tests/collision/inputs_rz_base # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output ) @@ -32,8 +32,7 @@ add_warpx_test( 3 # dims ON # mpi 1 # mpi_np - Examples/Tests/collision/inputs_3d_base # inputs_base + Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis collisionXYZ_plt000150 # output - Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs_test ) diff --git a/Examples/Tests/collision/inputs_3d_test_collisionXYZ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ index 1e46e6a0e0f..d096a9cc49f 100644 --- a/Examples/Tests/collision/inputs_3d_test_collisionXYZ +++ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ @@ -1,2 +1,5 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_3d_base + +# test input parameters diag1.file_prefix = collisionXYZ_plt diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 8f8c095b299..7f903f513a8 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -8,10 +8,9 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs_test ) # Langmuir_multi_2d_MR_anisotropic ############################################ @@ -21,10 +20,9 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs_test ) # Langmuir_multi_2d_MR_momentum_conserving #################################### @@ -34,10 +32,9 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs_test ) # Langmuir_multi_2d_MR_psatd ################################################## @@ -48,10 +45,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs_test ) endif() @@ -62,10 +58,9 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs_test ) @@ -77,10 +72,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs_test ) endif() @@ -92,10 +86,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs_test ) endif() @@ -107,10 +100,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs_test ) endif() @@ -122,10 +114,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs_test ) endif() @@ -137,10 +128,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs_test ) endif() @@ -152,10 +142,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs_test ) endif() @@ -167,10 +156,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs_test ) endif() @@ -182,10 +170,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs_test ) endif() @@ -198,10 +185,9 @@ endif() # 2 # dims # ON # mpi # 1 # mpi_np -# Examples/Tests/langmuir/inputs_2d_base # inputs_base +# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output -# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs_test # ) #endif() @@ -213,9 +199,8 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/langmuir/inputs_2d_base # inputs_base + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs_test ) endif() diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR index 586624654c1..f1184d174dd 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = ckc amr.max_level = 1 amr.ref_ratio = 4 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic index 91c2d1c80d3..a1be1f4adb6 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = ckc amr.max_level = 1 amr.ref_ratio_vect = 4 2 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving index 7f3cb50fd91..992a5d4d63c 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.field_gathering = momentum-conserving algo.maxwell_solver = ckc amr.max_level = 1 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd index 49296a2a04f..d031fc0888b 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = psatd amr.max_level = 1 amr.ref_ratio = 4 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal index a5c132eef91..bbd7b19b07f 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = direct diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd index 343cc0cede1..d3ea795bc05 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = psatd diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition index 1c40777711a..73fffe5f307 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = vay algo.maxwell_solver = psatd amr.max_grid_size = 128 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal index a514c1561f0..2a59bfd654d 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = vay algo.maxwell_solver = psatd amr.max_grid_size = 128 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 index 3f216a84708..d396d5eef2d 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = vay algo.maxwell_solver = psatd algo.particle_shape = 4 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction index 0fc4f59aa18..0cfbfe7298e 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = esirkepov algo.maxwell_solver = psatd amr.max_grid_size = 128 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal index 5f23ad4ffdb..246bd568b90 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = direct algo.maxwell_solver = psatd amr.max_grid_size = 128 diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving index 39e3eaeeadf..82828a8366c 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.field_gathering = momentum-conserving algo.maxwell_solver = psatd diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ index bb4b6a180ec..030adef1842 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = psatd psatd.J_in_time = linear psatd.solution_type = first-order diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal index f71c7bebb73..780cea2a286 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.maxwell_solver = psatd psatd.J_in_time = linear psatd.solution_type = first-order diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal index f865571edf7..d87d691e57f 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_2d_base + +# test input parameters algo.current_deposition = direct algo.maxwell_solver = psatd diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index b69fc586585..7ac7cdb946a 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -9,10 +9,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 1 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs_test ) endif() @@ -24,10 +23,9 @@ if(WarpX_FFT) 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_2d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs_test ) endif() @@ -39,10 +37,9 @@ if(WarpX_FFT) 3 # dims ON # mpi 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs_test ) endif() @@ -54,9 +51,8 @@ if(WarpX_FFT) 3 # dims ON # mpi 2 # mpi_np - Examples/Tests/nci_psatd_stability/inputs_avg_3d_base # inputs_base + Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs_test ) endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd index c7b32a2cf88..e3fa05446b3 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd @@ -1,3 +1,6 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_avg_2d_base + +# test input parameters psatd.current_correction = 0 warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid index 338daed4764..9af90cd7fad 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_avg_2d_base + +# test input parameters amr.max_grid_size_x = 128 amr.max_grid_size_y = 64 psatd.current_correction = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd index c7b32a2cf88..61f402ae39e 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd @@ -1,3 +1,6 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_avg_3d_base + +# test input parameters psatd.current_correction = 0 warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid index 03990cec08c..fc13885a46c 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid @@ -1,4 +1,7 @@ -# additional runtime parameters +# base input parameters +FILE = inputs_avg_3d_base + +# test input parameters psatd.current_correction = 0 warpx.abort_on_warning_threshold = medium warpx.grid_type = hybrid diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 3963f0ac53a..ff7642c47f9 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -8,7 +8,7 @@ add_warpx_test( 2 # dims ON # mpi 2 # mpi_np - Examples/Tests/single_particle/inputs_2d_base # inputs_base + Examples/Tests/single_particle/inputs_2d_base # inputs Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output ) From 56bef3a98596db838efb6d0597ee9884b45c9ade Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 09:35:35 -0700 Subject: [PATCH 024/167] Set `PYTHONPATH` to import custom modules --- Examples/CMakeLists.txt | 7 ++++++- .../capacitive_discharge/analysis_2d.py | 2 -- .../collider_relevant_diags/analysis_multiple_particles.py | 2 -- Examples/Tests/collision/analysis_collision_3d.py | 2 -- .../collision/analysis_collision_3d_isotropization.py | 1 - Examples/Tests/collision/analysis_collision_rz.py | 1 - Examples/Tests/langmuir/analysis_2d.py | 1 - Examples/Tests/nci_psatd_stability/analysis_galilean.py | 1 - 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index fc5068aba2c..540b37c36e4 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -82,7 +82,6 @@ function(add_warpx_test ${runtime_params} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) - if(mpi) set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") endif() @@ -96,7 +95,13 @@ function(add_warpx_test ${output} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) + # test analysis depends on test run set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") + # add paths for custom Python modules + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") + set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") endif() endfunction() diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py index 472758ec63b..d7eed2c1c21 100755 --- a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py +++ b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py @@ -9,8 +9,6 @@ import sys -sys.path.append('../../../../warpx/Regression/Checksum/') - import checksumAPI my_check = checksumAPI.evaluate_checksum( diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index 7bf4ef04d6b..2f9f4b79b56 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -8,10 +8,8 @@ import pandas as pd from scipy.constants import c, e, hbar, m_e -sys.path.append('../../../../warpx/Regression/Checksum/') import checksumAPI -sys.path.append('../../../../warpx/Tools/Parser/') from input_file_parser import parse_input_file E_crit = m_e**2*c**3/(e*hbar) diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index e988f6fa4d4..a9d8ff4ac52 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -32,10 +32,8 @@ import numpy import yt -sys.path.insert(1, '../../../../warpx/Regression/PostProcessingUtils/') import post_processing_utils -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI tolerance = 0.001 diff --git a/Examples/Tests/collision/analysis_collision_3d_isotropization.py b/Examples/Tests/collision/analysis_collision_3d_isotropization.py index ba029760e8b..1f0a1d36c62 100755 --- a/Examples/Tests/collision/analysis_collision_3d_isotropization.py +++ b/Examples/Tests/collision/analysis_collision_3d_isotropization.py @@ -18,7 +18,6 @@ import scipy.constants as sc import yt -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI e = sc.e diff --git a/Examples/Tests/collision/analysis_collision_rz.py b/Examples/Tests/collision/analysis_collision_rz.py index b206b2eba7b..dad489d42cd 100755 --- a/Examples/Tests/collision/analysis_collision_rz.py +++ b/Examples/Tests/collision/analysis_collision_rz.py @@ -23,7 +23,6 @@ import numpy as np import yt -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI tolerance = 1.0e-15 diff --git a/Examples/Tests/langmuir/analysis_2d.py b/Examples/Tests/langmuir/analysis_2d.py index 94f97ca6de8..e6406581c00 100755 --- a/Examples/Tests/langmuir/analysis_2d.py +++ b/Examples/Tests/langmuir/analysis_2d.py @@ -26,7 +26,6 @@ import numpy as np from scipy.constants import c, e, epsilon_0, m_e -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI # this will be the name of the plot file diff --git a/Examples/Tests/nci_psatd_stability/analysis_galilean.py b/Examples/Tests/nci_psatd_stability/analysis_galilean.py index 666d240da8f..a30ae31ed13 100755 --- a/Examples/Tests/nci_psatd_stability/analysis_galilean.py +++ b/Examples/Tests/nci_psatd_stability/analysis_galilean.py @@ -20,7 +20,6 @@ import scipy.constants as scc import yt ; yt.funcs.mylog.setLevel(0) -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI filename = sys.argv[1] From 1e0362e85a515bfed5e4c3ca5d793c18d26428e2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:35:49 +0000 Subject: [PATCH 025/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../capacitive_discharge/analysis_2d.py | 1 - .../collider_relevant_diags/analysis_multiple_particles.py | 6 ++---- Examples/Tests/collision/analysis_collision_3d.py | 6 ++---- .../Tests/collision/analysis_collision_3d_isotropization.py | 3 +-- Examples/Tests/collision/analysis_collision_rz.py | 3 +-- Examples/Tests/langmuir/analysis_2d.py | 3 +-- Examples/Tests/nci_psatd_stability/analysis_galilean.py | 2 +- 7 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py index d7eed2c1c21..4871884afe8 100755 --- a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py +++ b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py @@ -7,7 +7,6 @@ # solver that directly solves the Poisson equation using matrix inversion # rather than the iterative approach from the MLMG solver. -import sys import checksumAPI diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index 2f9f4b79b56..91838109624 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -3,14 +3,12 @@ import os import sys +import checksumAPI import numpy as np import openpmd_api as io import pandas as pd -from scipy.constants import c, e, hbar, m_e - -import checksumAPI - from input_file_parser import parse_input_file +from scipy.constants import c, e, hbar, m_e E_crit = m_e**2*c**3/(e*hbar) B_crit = m_e**2*c**2/(e*hbar) diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index a9d8ff4ac52..2f9460d2ee6 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -29,12 +29,10 @@ import re import sys +import checksumAPI import numpy -import yt - import post_processing_utils - -import checksumAPI +import yt tolerance = 0.001 diff --git a/Examples/Tests/collision/analysis_collision_3d_isotropization.py b/Examples/Tests/collision/analysis_collision_3d_isotropization.py index 1f0a1d36c62..c38abe3d35c 100755 --- a/Examples/Tests/collision/analysis_collision_3d_isotropization.py +++ b/Examples/Tests/collision/analysis_collision_3d_isotropization.py @@ -14,12 +14,11 @@ import os import sys +import checksumAPI import numpy as np import scipy.constants as sc import yt -import checksumAPI - e = sc.e pi = sc.pi ep0 = sc.epsilon_0 diff --git a/Examples/Tests/collision/analysis_collision_rz.py b/Examples/Tests/collision/analysis_collision_rz.py index dad489d42cd..e3b8901aeb1 100755 --- a/Examples/Tests/collision/analysis_collision_rz.py +++ b/Examples/Tests/collision/analysis_collision_rz.py @@ -20,11 +20,10 @@ import sys from glob import glob +import checksumAPI import numpy as np import yt -import checksumAPI - tolerance = 1.0e-15 last_fn = sys.argv[1] diff --git a/Examples/Tests/langmuir/analysis_2d.py b/Examples/Tests/langmuir/analysis_2d.py index e6406581c00..e1fad8b63a1 100755 --- a/Examples/Tests/langmuir/analysis_2d.py +++ b/Examples/Tests/langmuir/analysis_2d.py @@ -23,11 +23,10 @@ yt.funcs.mylog.setLevel(50) +import checksumAPI import numpy as np from scipy.constants import c, e, epsilon_0, m_e -import checksumAPI - # this will be the name of the plot file fn = sys.argv[1] diff --git a/Examples/Tests/nci_psatd_stability/analysis_galilean.py b/Examples/Tests/nci_psatd_stability/analysis_galilean.py index a30ae31ed13..f8d98e6d072 100755 --- a/Examples/Tests/nci_psatd_stability/analysis_galilean.py +++ b/Examples/Tests/nci_psatd_stability/analysis_galilean.py @@ -16,11 +16,11 @@ import re import sys +import checksumAPI import numpy as np import scipy.constants as scc import yt ; yt.funcs.mylog.setLevel(0) -import checksumAPI filename = sys.argv[1] From feaaeda85b78723d3cf560a0d402cce4aae47cb8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 09:45:18 -0700 Subject: [PATCH 026/167] Restore relative paths of custom modules in analysis scripts --- .../capacitive_discharge/analysis_2d.py | 2 ++ .../analysis_multiple_particles.py | 8 ++++++-- Examples/Tests/collision/analysis_collision_3d.py | 2 ++ .../collision/analysis_collision_3d_isotropization.py | 1 + Examples/Tests/collision/analysis_collision_rz.py | 1 + Examples/Tests/langmuir/analysis_2d.py | 1 + Examples/Tests/nci_psatd_stability/analysis_galilean.py | 1 + 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py index 4871884afe8..992e26f8228 100755 --- a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py +++ b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py @@ -7,7 +7,9 @@ # solver that directly solves the Poisson equation using matrix inversion # rather than the iterative approach from the MLMG solver. +import sys +sys.path.append('../../../../warpx/Regression/Checksum/') import checksumAPI my_check = checksumAPI.evaluate_checksum( diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index 91838109624..7bf4ef04d6b 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -3,13 +3,17 @@ import os import sys -import checksumAPI import numpy as np import openpmd_api as io import pandas as pd -from input_file_parser import parse_input_file from scipy.constants import c, e, hbar, m_e +sys.path.append('../../../../warpx/Regression/Checksum/') +import checksumAPI + +sys.path.append('../../../../warpx/Tools/Parser/') +from input_file_parser import parse_input_file + E_crit = m_e**2*c**3/(e*hbar) B_crit = m_e**2*c**2/(e*hbar) diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index 2f9460d2ee6..aef274dbc55 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -29,7 +29,9 @@ import re import sys +sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI + import numpy import post_processing_utils import yt diff --git a/Examples/Tests/collision/analysis_collision_3d_isotropization.py b/Examples/Tests/collision/analysis_collision_3d_isotropization.py index c38abe3d35c..921eeb2f69d 100755 --- a/Examples/Tests/collision/analysis_collision_3d_isotropization.py +++ b/Examples/Tests/collision/analysis_collision_3d_isotropization.py @@ -14,6 +14,7 @@ import os import sys +sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI import numpy as np import scipy.constants as sc diff --git a/Examples/Tests/collision/analysis_collision_rz.py b/Examples/Tests/collision/analysis_collision_rz.py index e3b8901aeb1..85ee6518752 100755 --- a/Examples/Tests/collision/analysis_collision_rz.py +++ b/Examples/Tests/collision/analysis_collision_rz.py @@ -20,6 +20,7 @@ import sys from glob import glob +sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI import numpy as np import yt diff --git a/Examples/Tests/langmuir/analysis_2d.py b/Examples/Tests/langmuir/analysis_2d.py index e1fad8b63a1..e65652bae78 100755 --- a/Examples/Tests/langmuir/analysis_2d.py +++ b/Examples/Tests/langmuir/analysis_2d.py @@ -23,6 +23,7 @@ yt.funcs.mylog.setLevel(50) +sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI import numpy as np from scipy.constants import c, e, epsilon_0, m_e diff --git a/Examples/Tests/nci_psatd_stability/analysis_galilean.py b/Examples/Tests/nci_psatd_stability/analysis_galilean.py index f8d98e6d072..d542d489f76 100755 --- a/Examples/Tests/nci_psatd_stability/analysis_galilean.py +++ b/Examples/Tests/nci_psatd_stability/analysis_galilean.py @@ -16,6 +16,7 @@ import re import sys +sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI import numpy as np import scipy.constants as scc From 5bf6de4dd304443caa0bfcaa205a7a0b78d99610 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:46:52 +0000 Subject: [PATCH 027/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Examples/Tests/collision/analysis_collision_3d.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index aef274dbc55..13aff099f7a 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -31,7 +31,6 @@ sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI - import numpy import post_processing_utils import yt From f405bbcfa352da0bf978627e6d104a42ff3ca992 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 11:50:49 -0700 Subject: [PATCH 028/167] Do not pass number of MPI procs - Hard-coded to 2 for all MPI tests - Run single-proc tests without MPI --- Examples/CMakeLists.txt | 3 +- .../capacitive_discharge/CMakeLists.txt | 2 -- Examples/Tests/btd_rz/CMakeLists.txt | 1 - .../collider_relevant_diags/CMakeLists.txt | 1 - Examples/Tests/collision/CMakeLists.txt | 15 ++++---- Examples/Tests/langmuir/CMakeLists.txt | 35 ++++++------------- .../Tests/nci_psatd_stability/CMakeLists.txt | 8 ++--- Examples/Tests/single_particle/CMakeLists.txt | 1 - 8 files changed, 19 insertions(+), 47 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 540b37c36e4..fac278d799d 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -21,7 +21,6 @@ function(add_warpx_test name dims mpi - mpi_np inputs analysis output @@ -53,7 +52,7 @@ function(add_warpx_test set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} ${MPI_ALLOW_ROOT} - ${MPIEXEC_NUMPROC_FLAG} ${mpi_np} + ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_POSTFLAGS} ${MPIEXEC_PREFLAGS} ) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index ff4ce6db61a..4825df3c6c4 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -5,7 +5,6 @@ add_warpx_test( background_mcc # name 2 # dims ON # mpi - 2 # mpi_np Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output @@ -18,7 +17,6 @@ add_warpx_test( # background_mcc_dp_psp # name # 2 # dims # ON # mpi -# 2 # mpi_np # Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index ef87ea988c8..56036305dac 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -7,7 +7,6 @@ add_warpx_test( BTD_rz # name RZ # dims ON # mpi - 2 # mpi_np Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index 1becbf86253..7128b5f7749 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -7,7 +7,6 @@ add_warpx_test( collider_diagnostics # name 3 # dims ON # mpi - 2 # mpi_np Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 9d6b64a3b99..dabc5849b1b 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -5,9 +5,8 @@ # add_warpx_test( collisionISO # name - 3 # dims - ON # mpi - 1 # mpi_np + 3 # dims + OFF # mpi Examples/Tests/collision/inputs_3d_isotropization_base # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output @@ -17,9 +16,8 @@ add_warpx_test( # add_warpx_test( collisionRZ # name - RZ # dims - ON # mpi - 1 # mpi_np + RZ # dims + OFF # mpi Examples/Tests/collision/inputs_rz_base # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output @@ -29,9 +27,8 @@ add_warpx_test( # add_warpx_test( collisionXYZ # name - 3 # dims - ON # mpi - 1 # mpi_np + 3 # dims + OFF # mpi Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis collisionXYZ_plt000150 # output diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 7f903f513a8..2b4bf6eccfd 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -7,7 +7,6 @@ add_warpx_test( Langmuir_multi_2d_MR # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -19,7 +18,6 @@ add_warpx_test( Langmuir_multi_2d_MR_anisotropic # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -31,7 +29,6 @@ add_warpx_test( Langmuir_multi_2d_MR_momentum_conserving # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -44,7 +41,6 @@ if(WarpX_FFT) Langmuir_multi_2d_MR_psatd # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -57,7 +53,6 @@ add_warpx_test( Langmuir_multi_2d_nodal # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -71,7 +66,6 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -83,9 +77,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_current_correction # name - 2 # dims - ON # mpi - 1 # mpi_np + 2 # dims + OFF # mpi Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -97,9 +90,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_current_correction_nodal # name - 2 # dims - ON # mpi - 1 # mpi_np + 2 # dims + OFF # mpi Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -113,7 +105,6 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_momentum_conserving # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -127,7 +118,6 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_multiJ # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -141,7 +131,6 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_multiJ_nodal # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -155,7 +144,6 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_nodal # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -167,9 +155,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_Vay_deposition # name - 2 # dims - ON # mpi - 1 # mpi_np + 2 # dims + OFF # mpi Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -182,9 +169,8 @@ endif() #if(WarpX_FFT) # add_warpx_test( # Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name -# 2 # dims -# ON # mpi -# 1 # mpi_np +# 2 # dims +# OFF # mpi # Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output @@ -196,9 +182,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_Vay_deposition_nodal # name - 2 # dims - ON # mpi - 1 # mpi_np + 2 # dims + OFF # mpi Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 7ac7cdb946a..983fab18b14 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -6,9 +6,8 @@ if(WarpX_FFT) add_warpx_test( averaged_galilean_2d_psatd # name - 2 # dims - ON # mpi - 1 # mpi_np + 2 # dims + OFF # mpi Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -22,7 +21,6 @@ if(WarpX_FFT) averaged_galilean_2d_psatd_hybrid # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -36,7 +34,6 @@ if(WarpX_FFT) averaged_galilean_3d_psatd # name 3 # dims ON # mpi - 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -50,7 +47,6 @@ if(WarpX_FFT) averaged_galilean_3d_psatd_hybrid # name 3 # dims ON # mpi - 2 # mpi_np Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index ff7642c47f9..985f25b253b 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -7,7 +7,6 @@ add_warpx_test( bilinear_filter # name 2 # dims ON # mpi - 2 # mpi_np Examples/Tests/single_particle/inputs_2d_base # inputs Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output From 3d672fc38634d837a0ba60a077392f22e2de7d9b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 11:52:47 -0700 Subject: [PATCH 029/167] Cleanup --- .azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 747b16beb46..8b9e7986fa3 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -25,17 +25,17 @@ jobs: # FIXME strategy: matrix: - cartesian1d: + cartesian_1d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' - cartesian2d: + cartesian_2d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' - cartesian3d: + cartesian_3d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' single_precision: WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' - nompi: + no_mpi: WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' embedded_boundary: WARPX_CMAKE_FLAGS: -DWarpX_EB='ON' From b0176fcff3b91916eddff24518a6fa05ab55410d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 11:57:20 -0700 Subject: [PATCH 030/167] `openpmd-viewer` required by checksum scripts --- .azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8b9e7986fa3..0306d0b731e 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -107,7 +107,9 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi + # Python modules required for test analysis python3 -m pip install --upgrade yt + python3 -m pip install --upgrade openpmd-viewer rm -rf ${CEI_TMP} df -h displayName: 'Install dependencies' From 19be7d6ffb5c49c847bcd407b330bd5da89e86c7 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 12:08:02 -0700 Subject: [PATCH 031/167] Cleanup --- .azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0306d0b731e..9fdc6dcbd42 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -31,14 +31,14 @@ jobs: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' cartesian_3d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' - rz: + cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' - single_precision: - WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' - no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' embedded_boundary: WARPX_CMAKE_FLAGS: -DWarpX_EB='ON' + no_mpi: + WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' + single_precision: + WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' # default: 60; maximum: 360 timeoutInMinutes: 240 From 675259fee07fccce62f29de8c9f107fc390012a0 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 14:00:52 -0700 Subject: [PATCH 032/167] Install requirements, clone warpx-data repo --- .azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 9fdc6dcbd42..bf429aec9ef 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -108,8 +108,11 @@ jobs: -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi # Python modules required for test analysis + python3 -m pip install --upgrade -r requirements.txt python3 -m pip install --upgrade yt python3 -m pip install --upgrade openpmd-viewer + # external repositories required for test analysis + git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git rm -rf ${CEI_TMP} df -h displayName: 'Install dependencies' From 065675da1a360cfec56097fa2cf50bbd52871712 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 14:24:28 -0700 Subject: [PATCH 033/167] Cleanup --- .azure-pipelines.yml | 1 - Regression/WarpX-tests.ini | 756 ++++++++++++++++++------------------- 2 files changed, 378 insertions(+), 379 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index bf429aec9ef..25da1f6dd44 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -22,7 +22,6 @@ jobs: WARPX_CI_OPENPMD: 'TRUE' WARPX_CI_TMP: '/tmp/ci' - # FIXME strategy: matrix: cartesian_1d: diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 50cf2578844..8048318de7a 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -69,131 +69,131 @@ cmakeSetupOpts = -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_PYTHON_IPO=OFF # individual problems follow -#[averaged_galilean_2d_psatd] -#buildDir = . -#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d -#runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -#[averaged_galilean_2d_psatd_hybrid] -#buildDir = . -#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d -#runtime_params = amr.max_grid_size_x=128 amr.max_grid_size_y=64 warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -#[averaged_galilean_3d_psatd] -#buildDir = . -#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d -#runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 3 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -#[averaged_galilean_3d_psatd_hybrid] -#buildDir = . -#inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d -#runtime_params = warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 3 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py - -#[background_mcc] -#buildDir = . -#inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d -#runtime_params = warpx.abort_on_warning_threshold = high -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/analysis_default_regression.py - -#[background_mcc_dp_psp] -#buildDir = . -#inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d -#runtime_params = warpx.abort_on_warning_threshold = high -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_PRECISION=DOUBLE -DWarpX_PARTICLE_PRECISION=SINGLE -DWarpX_QED=OFF -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/analysis_default_regression.py - -#[bilinear_filter] -#buildDir = . -#inputFile = Examples/Tests/single_particle/inputs_2d -#runtime_params = warpx.use_filter=1 warpx.filter_npass_each_dir=1 5 -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py - -#[BTD_rz] -#buildDir = . -#inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD -#runtime_params = -#dim = 2 -#addToCompileString = USE_RZ=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=RZ -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py - -#[collider_diagnostics] -#buildDir = . -#inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles -#runtime_params = warpx.abort_on_warning_threshold=high -#dim = 3 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=3 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +[averaged_galilean_2d_psatd] +buildDir = . +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d +runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +[averaged_galilean_2d_psatd_hybrid] +buildDir = . +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_2d +runtime_params = amr.max_grid_size_x=128 amr.max_grid_size_y=64 warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +[averaged_galilean_3d_psatd] +buildDir = . +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d +runtime_params = psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 3 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +[averaged_galilean_3d_psatd_hybrid] +buildDir = . +inputFile = Examples/Tests/nci_psatd_stability/inputs_avg_3d +runtime_params = warpx.grid_type=hybrid psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 3 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=3 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py + +[background_mcc] +buildDir = . +inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d +runtime_params = warpx.abort_on_warning_threshold = high +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/analysis_default_regression.py + +[background_mcc_dp_psp] +buildDir = . +inputFile = Examples/Physics_applications/capacitive_discharge/inputs_2d +runtime_params = warpx.abort_on_warning_threshold = high +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_PRECISION=DOUBLE -DWarpX_PARTICLE_PRECISION=SINGLE -DWarpX_QED=OFF +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/analysis_default_regression.py + +[bilinear_filter] +buildDir = . +inputFile = Examples/Tests/single_particle/inputs_2d +runtime_params = warpx.use_filter=1 warpx.filter_npass_each_dir=1 5 +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py + +[BTD_rz] +buildDir = . +inputFile = Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD +runtime_params = +dim = 2 +addToCompileString = USE_RZ=TRUE +cmakeSetupOpts = -DWarpX_DIMS=RZ +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py + +[collider_diagnostics] +buildDir = . +inputFile = Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles +runtime_params = warpx.abort_on_warning_threshold=high +dim = 3 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=3 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py [collisionZ] buildDir = . @@ -209,50 +209,50 @@ useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/collision/analysis_collision_1d.py -#[collisionISO] -#buildDir = . -#inputFile = Examples/Tests/collision/inputs_3d_isotropization -#runtime_params = -#dim = 3 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=3 -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py -#aux1File = Regression/PostProcessingUtils/post_processing_utils.py - -#[collisionRZ] -#buildDir = . -#inputFile = Examples/Tests/collision/inputs_rz -#runtime_params = -#dim = 2 -#addToCompileString = USE_RZ=TRUE USE_FFT=FALSE -#cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_FFT=OFF -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/collision/analysis_collision_rz.py -#aux1File = Regression/PostProcessingUtils/post_processing_utils.py - -#[collisionXYZ] -#buildDir = . -#inputFile = Examples/Tests/collision/inputs_3d -#runtime_params = -#dim = 3 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=3 -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/collision/analysis_collision_3d.py -#aux1File = Regression/PostProcessingUtils/post_processing_utils.py +[collisionISO] +buildDir = . +inputFile = Examples/Tests/collision/inputs_3d_isotropization +runtime_params = +dim = 3 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=3 +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py +aux1File = Regression/PostProcessingUtils/post_processing_utils.py + +[collisionRZ] +buildDir = . +inputFile = Examples/Tests/collision/inputs_rz +runtime_params = +dim = 2 +addToCompileString = USE_RZ=TRUE USE_FFT=FALSE +cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_FFT=OFF +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/collision/analysis_collision_rz.py +aux1File = Regression/PostProcessingUtils/post_processing_utils.py + +[collisionXYZ] +buildDir = . +inputFile = Examples/Tests/collision/inputs_3d +runtime_params = +dim = 3 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=3 +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/collision/analysis_collision_3d.py +aux1File = Regression/PostProcessingUtils/post_processing_utils.py [collisionXZ] buildDir = . @@ -1016,215 +1016,215 @@ useOMP = 1 numthreads = 1 analysisRoutine = Examples/Tests/langmuir/analysis_1d.py -#[Langmuir_multi_2d_MR] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_MR_anisotropic] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_MR_momentum_conserving] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_MR_psatd] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_nodal] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz -#dim = 2 -#addToCompileString = -#cmakeSetupOpts = -DWarpX_DIMS=2 -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_current_correction] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_current_correction_nodal] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_momentum_conserving] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_multiJ] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_multiJ_nodal] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_nodal] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 2 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_Vay_deposition] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py - -#[Langmuir_multi_2d_psatd_Vay_deposition_nodal] -#buildDir = . -#inputFile = Examples/Tests/langmuir/inputs_2d -#runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 -#dim = 2 -#addToCompileString = USE_FFT=TRUE -#cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON -#restartTest = 0 -#useMPI = 1 -#numprocs = 1 -#useOMP = 1 -#numthreads = 1 -#analysisRoutine = Examples/Tests/langmuir/analysis_2d.py +[Langmuir_multi_2d_MR] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_MR_anisotropic] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver = ckc warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio_vect = 4 2 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_MR_momentum_conserving] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=ckc warpx.use_filter=1 amr.max_level=1 amr.ref_ratio=4 warpx.fine_tag_lo=-10.e-6 -10.e-6 warpx.fine_tag_hi=10.e-6 10.e-6 algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_MR_psatd] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver = psatd warpx.use_filter = 1 amr.max_level = 1 amr.ref_ratio = 4 warpx.fine_tag_lo = -10.e-6 -10.e-6 warpx.fine_tag_hi = 10.e-6 10.e-6 diag1.electrons.variables = x z w ux uy uz diag1.positrons.variables = x z w ux uy uz psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_nodal] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz +dim = 2 +addToCompileString = +cmakeSetupOpts = -DWarpX_DIMS=2 +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_current_correction] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=esirkepov psatd.periodic_single_box_fft=1 psatd.current_correction=1 diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_current_correction_nodal] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=direct psatd.periodic_single_box_fft=1 psatd.current_correction=1 warpx.grid_type=collocated diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot =Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_momentum_conserving] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd algo.field_gathering=momentum-conserving diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_multiJ] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_multiJ_nodal] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd warpx.cfl=0.7071067811865475 psatd.update_with_rho=1 warpx.do_multi_J=1 warpx.do_multi_J_n_depositions=2 psatd.solution_type=first-order psatd.J_in_time=linear warpx.abort_on_warning_threshold=medium warpx.grid_type=collocated +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_nodal] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd warpx.grid_type=collocated algo.current_deposition=direct diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot=Ex Ey Ez jx jy jz part_per_cell warpx.cfl = 0.7071067811865475 psatd.current_correction=0 warpx.abort_on_warning_threshold=medium +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 2 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_Vay_deposition] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 algo.particle_shape=4 +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py + +[Langmuir_multi_2d_psatd_Vay_deposition_nodal] +buildDir = . +inputFile = Examples/Tests/langmuir/inputs_2d +runtime_params = algo.maxwell_solver=psatd amr.max_grid_size=128 warpx.grid_type=collocated algo.current_deposition=vay diag1.electrons.variables=x z w ux uy uz diag1.positrons.variables=x z w ux uy uz diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE warpx.cfl = 0.7071067811865475 +dim = 2 +addToCompileString = USE_FFT=TRUE +cmakeSetupOpts = -DWarpX_DIMS=2 -DWarpX_FFT=ON +restartTest = 0 +useMPI = 1 +numprocs = 1 +useOMP = 1 +numthreads = 1 +analysisRoutine = Examples/Tests/langmuir/analysis_2d.py [Langmuir_multi_nodal] buildDir = . From d86ea62302ada305a29665c8af3102f8c90f6ad8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 15:46:35 -0700 Subject: [PATCH 034/167] Fix broken dependencies --- .azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 25da1f6dd44..e95444599c3 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -79,6 +79,8 @@ jobs: python3 python3-pandas python3-pip python3-venv python3-setuptools libblas-dev liblapack-dev ccache --set-config=max_size=10.0G python3 -m pip install --upgrade pip + python3 -m pip install --upgrade build + python3 -m pip install --upgrade packaging python3 -m pip install --upgrade setuptools python3 -m pip install --upgrade wheel python3 -m pip install --upgrade virtualenv From 6d2bf40bd660534b30807e3573e7125d1b9440a9 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 17:36:43 -0700 Subject: [PATCH 035/167] Fix broken dependencies (numpy, pandas) --- .azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index e95444599c3..8ffc22a1eda 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -112,6 +112,7 @@ jobs: python3 -m pip install --upgrade -r requirements.txt python3 -m pip install --upgrade yt python3 -m pip install --upgrade openpmd-viewer + python3 -m pip install --upgrade pandas # external repositories required for test analysis git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git rm -rf ${CEI_TMP} From 8717ce682b59f88ccf9b3988ecf821f08a8e51e4 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 17:41:44 -0700 Subject: [PATCH 036/167] Install correct requirements --- .azure-pipelines.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8ffc22a1eda..23023aa6846 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -109,10 +109,7 @@ jobs: -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi # Python modules required for test analysis - python3 -m pip install --upgrade -r requirements.txt - python3 -m pip install --upgrade yt - python3 -m pip install --upgrade openpmd-viewer - python3 -m pip install --upgrade pandas + python3 -m pip install --upgrade -r Regression/requirements.txt # external repositories required for test analysis git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git rm -rf ${CEI_TMP} From 99638c74a94d760b8fd098a334a9a84f5c6784f8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 1 Aug 2024 17:53:06 -0700 Subject: [PATCH 037/167] Avoid duplicate runs with/without MPI --- Examples/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index fac278d799d..3e2eea576ba 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -30,6 +30,12 @@ function(add_warpx_test return() endif() + # do not run no-MPI tests w/ MPI support + if(NOT mpi AND WarpX_MPI) + return() + endif() + + # cannot run tests with unsupported geometry if(NOT dims IN_LIST WarpX_DIMS) return() endif() From 680f25eb6b5802b1bdbcb00d5a5370a8cd02132b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 10:34:03 -0700 Subject: [PATCH 038/167] Build all dims for single-process tests --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 23023aa6846..e6ab912d4fc 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -35,7 +35,7 @@ jobs: embedded_boundary: WARPX_CMAKE_FLAGS: -DWarpX_EB='ON' no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' + WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' -DWarpX_DIMS='1;2;3;RZ' single_precision: WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' From 62953aa3bd0386f9814d130b7e9c7c0228758901 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 10:56:29 -0700 Subject: [PATCH 039/167] Fix path of warpx-data repo --- .azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index e6ab912d4fc..46627802d39 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -111,7 +111,12 @@ jobs: # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt # external repositories required for test analysis + ls -la . + cd .. git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git + ls -la . + cd - + ls -la . rm -rf ${CEI_TMP} df -h displayName: 'Install dependencies' From 98674487e956a7d25e277bd1b83e60b9554e6571 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 11:08:50 -0700 Subject: [PATCH 040/167] Fix broken test --- .../collider_relevant_diags/analysis_multiple_particles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index 7bf4ef04d6b..053dd2458e8 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -54,7 +54,7 @@ def dL_dt(): lumi.append(l) return lumi -input_dict = parse_input_file('../../../../warpx/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base') +input_dict = parse_input_file('inputs_3d_multiple_particles_base') Ex, Ey, Ez = [float(w) for w in input_dict['particles.E_external_particle']] Bx, By, Bz = [float(w) for w in input_dict['particles.B_external_particle']] From 38c6d36490ef20bc13b9474e496ce23ca1255723 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 11:41:29 -0700 Subject: [PATCH 041/167] Cleanup --- .azure-pipelines.yml | 4 +--- Examples/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 46627802d39..6b68972f65f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -20,6 +20,7 @@ jobs: WARPX_CI_CCACHE: 'TRUE' WARPX_CI_NUM_MAKE_JOBS: 2 WARPX_CI_OPENPMD: 'TRUE' + # TODO remove (unused) WARPX_CI_TMP: '/tmp/ci' strategy: @@ -111,12 +112,9 @@ jobs: # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt # external repositories required for test analysis - ls -la . cd .. git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git - ls -la . cd - - ls -la . rm -rf ${CEI_TMP} df -h displayName: 'Install dependencies' diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3e2eea576ba..15370118dd5 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -64,7 +64,6 @@ function(add_warpx_test ) endif() - # FIXME set(runtime_params "amrex.abort_on_unused_inputs = 1" "amrex.fpe_trap_invalid = 1" @@ -72,6 +71,7 @@ function(add_warpx_test "amrex.fpe_trap_zero = 1" "amrex.throw_exception = 1" "warpx.always_warn_immediately = 1" + # FIXME should come before input file #"warpx.abort_on_warning_threshold = low" "warpx.do_dynamic_scheduling = 0" "warpx.serialize_initial_conditions = 1" From 453522383fd4d27ad7a7f6f1743348afbae936f0 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 13:55:09 -0700 Subject: [PATCH 042/167] Add support for Python tests --- .azure-pipelines.yml | 46 +++++----- Examples/CMakeLists.txt | 84 +++++++++++++------ .../capacitive_discharge/CMakeLists.txt | 10 +++ 3 files changed, 93 insertions(+), 47 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 6b68972f65f..41df629dfd6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -9,6 +9,7 @@ pr: jobs: - job: + # FIXME remove unused variables variables: BLASPP_HOME: '/usr/local' CEI_SUDO: 'sudo' @@ -20,7 +21,6 @@ jobs: WARPX_CI_CCACHE: 'TRUE' WARPX_CI_NUM_MAKE_JOBS: 2 WARPX_CI_OPENPMD: 'TRUE' - # TODO remove (unused) WARPX_CI_TMP: '/tmp/ci' strategy: @@ -34,11 +34,13 @@ jobs: cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' embedded_boundary: - WARPX_CMAKE_FLAGS: -DWarpX_EB='ON' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_EB='ON' no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_MPI='OFF' -DWarpX_DIMS='1;2;3;RZ' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_MPI='OFF' + python: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_APP='OFF' -DWarpX_PYTHON='ON' single_precision: - WARPX_CMAKE_FLAGS: -DWarpX_PRECISION='SINGLE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_PRECISION='SINGLE' # default: 60; maximum: 360 timeoutInMinutes: 240 @@ -91,24 +93,24 @@ jobs: export PATH="$HOME/.local/bin:$PATH" sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.com/ax3l/cmake-easyinstall/main/cmake-easyinstall sudo chmod a+x /usr/local/bin/cmake-easyinstall - if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then - cmake-easyinstall --prefix=/usr/local \ - git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF - python3 -m pip install --upgrade openpmd-api - fi - if [[ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]]; then - cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/blaspp.git \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_CXX_STANDARD=17 \ - -Duse_openmp=OFF -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/lapackpp.git \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_CXX_STANDARD=17 \ - -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - fi + #if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then + # cmake-easyinstall --prefix=/usr/local \ + # git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ + # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + # -DCMAKE_VERBOSE_MAKEFILE=ON \ + # -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF + # python3 -m pip install --upgrade openpmd-api + #fi + #if [[ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]]; then + # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/blaspp.git \ + # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + # -DCMAKE_CXX_STANDARD=17 \ + # -Duse_openmp=OFF -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON + # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/lapackpp.git \ + # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + # -DCMAKE_CXX_STANDARD=17 \ + # -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON + #fi # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt # external repositories required for test analysis diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 15370118dd5..5491a63a07c 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -40,6 +40,23 @@ function(add_warpx_test return() endif() + # Python test? + if(inputs MATCHES ".*\.py$") + set(python ON) + else() + set(python OFF) + endif() + + # cannot run Python tests w/o Python support + if(python AND NOT WarpX_PYTHON) + return() + endif() + + # do not run no-Python tests w/ Python support + if(NOT python AND WarpX_PYTHON) + return() + endif() + # set dimension suffix warpx_set_suffix_dims(SD ${dims}) @@ -64,29 +81,46 @@ function(add_warpx_test ) endif() - set(runtime_params - "amrex.abort_on_unused_inputs = 1" - "amrex.fpe_trap_invalid = 1" - "amrex.fpe_trap_overflow = 1" - "amrex.fpe_trap_zero = 1" - "amrex.throw_exception = 1" - "warpx.always_warn_immediately = 1" - # FIXME should come before input file - #"warpx.abort_on_warning_threshold = low" - "warpx.do_dynamic_scheduling = 0" - "warpx.serialize_initial_conditions = 1" - ) + set(THIS_Python_EXE) + if(python) + set(THIS_Python_EXE ${Python_EXECUTABLE}) + endif() # test run - add_test( - NAME ${name}.run - COMMAND - ${THIS_MPI_TEST_EXE} - $ - ${WarpX_SOURCE_DIR}/${inputs} - ${runtime_params} - WORKING_DIRECTORY ${THIS_WORKING_DIR} - ) + if(python) + add_test( + NAME ${name}.run + COMMAND + ${THIS_MPI_TEST_EXE} + ${THIS_Python_EXE} + ${WarpX_SOURCE_DIR}/${inputs} + WORKING_DIRECTORY ${THIS_WORKING_DIR} + ) + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_PYTHON_OUTPUT_DIRECTORY}:$ENV{PYTHONPATH}") + else() + set(runtime_params + "amrex.abort_on_unused_inputs = 1" + "amrex.fpe_trap_invalid = 1" + "amrex.fpe_trap_overflow = 1" + "amrex.fpe_trap_zero = 1" + "amrex.throw_exception = 1" + "warpx.always_warn_immediately = 1" + # FIXME should come before input file + #"warpx.abort_on_warning_threshold = low" + "warpx.do_dynamic_scheduling = 0" + "warpx.serialize_initial_conditions = 1" + ) + add_test( + NAME ${name}.run + COMMAND + ${THIS_MPI_TEST_EXE} + $ + ${WarpX_SOURCE_DIR}/${inputs} + ${runtime_params} + WORKING_DIRECTORY ${THIS_WORKING_DIR} + ) + endif() + if(mpi) set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") endif() @@ -103,10 +137,10 @@ function(add_warpx_test # test analysis depends on test run set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") # add paths for custom Python modules - set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") - set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") - set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") - set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") + set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") + set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") + set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") + set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}") endif() endfunction() diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 4825df3c6c4..e2fd1151ce4 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -21,3 +21,13 @@ add_warpx_test( # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output #) + +add_warpx_test( + Python_background_mcc # name + 2 # dims + ON # mpi + Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py # inputs + Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis + diags/diag1000050 # output +) + From 09899bd85ee2fb89c6adb79530f689373212ad44 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:55:36 +0000 Subject: [PATCH 043/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .azure-pipelines.yml | 2 +- .../Physics_applications/capacitive_discharge/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 41df629dfd6..852ddffde49 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -36,7 +36,7 @@ jobs: embedded_boundary: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_EB='ON' no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_MPI='OFF' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_MPI='OFF' python: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_APP='OFF' -DWarpX_PYTHON='ON' single_precision: diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index e2fd1151ce4..bdc4380706e 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -30,4 +30,3 @@ add_warpx_test( Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output ) - From dc305fdabf28cfa548ca0b790976486eef9d981c Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 14:36:44 -0700 Subject: [PATCH 044/167] Fix `PYTHONPATH` environment variable --- Examples/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 5491a63a07c..19a23d8685a 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -96,7 +96,7 @@ function(add_warpx_test ${WarpX_SOURCE_DIR}/${inputs} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) - set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_PYTHON_OUTPUT_DIRECTORY}:$ENV{PYTHONPATH}") + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") else() set(runtime_params "amrex.abort_on_unused_inputs = 1" @@ -137,10 +137,10 @@ function(add_warpx_test # test analysis depends on test run set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") # add paths for custom Python modules - set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") - set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") - set(PYTHONPATH "$ENV{PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") - set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") + set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") endif() endfunction() From bfb68de5b1fd064fa051e0ceb3652fdd4406b867 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 15:16:52 -0700 Subject: [PATCH 045/167] Build always with `WarpX_FFT=ON` --- .azure-pipelines.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 852ddffde49..6bd82df5c6c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -26,21 +26,21 @@ jobs: strategy: matrix: cartesian_1d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' -DWarpX_FFT=ON cartesian_2d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' -DWarpX_FFT=ON cartesian_3d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' -DWarpX_FFT=ON cylindrical_rz: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' -DWarpX_FFT=ON embedded_boundary: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_EB='ON' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB='ON' no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_MPI='OFF' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI='OFF' python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_APP='OFF' -DWarpX_PYTHON='ON' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON='ON' -DWarpX_APP='OFF' single_precision: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_PRECISION='SINGLE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION='SINGLE' # default: 60; maximum: 360 timeoutInMinutes: 240 From bde15c4c7d8dc0b59d6dcb487a66414f600463cd Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 15:25:35 -0700 Subject: [PATCH 046/167] Fix BLAS++/LAPACK++ installation for RZ builds --- .azure-pipelines.yml | 20 ++++++++++---------- Examples/CMakeLists.txt | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 6bd82df5c6c..3c3d888c0b3 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -101,16 +101,16 @@ jobs: # -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF # python3 -m pip install --upgrade openpmd-api #fi - #if [[ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]]; then - # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/blaspp.git \ - # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - # -DCMAKE_CXX_STANDARD=17 \ - # -Duse_openmp=OFF -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/lapackpp.git \ - # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - # -DCMAKE_CXX_STANDARD=17 \ - # -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - #fi + if [ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]; then + cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/blaspp.git \ + -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + -DCMAKE_CXX_STANDARD=17 \ + -Duse_openmp=OFF -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON + cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/lapackpp.git \ + -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + -DCMAKE_CXX_STANDARD=17 \ + -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON + fi # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt # external repositories required for test analysis diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 19a23d8685a..2a134d2d075 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -96,6 +96,7 @@ function(add_warpx_test ${WarpX_SOURCE_DIR}/${inputs} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) + # FIXME Use helper function to handle Windows exceptions set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") else() set(runtime_params From d46b44254332e8f46fa8f4df267233d756d9f4a2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 15:32:22 -0700 Subject: [PATCH 047/167] Comment out Azure matrix elements until supported --- .azure-pipelines.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 3c3d888c0b3..52a553701b9 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -24,6 +24,7 @@ jobs: WARPX_CI_TMP: '/tmp/ci' strategy: + # FIXME uncomment all variants matrix: cartesian_1d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' -DWarpX_FFT=ON @@ -33,14 +34,14 @@ jobs: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' -DWarpX_FFT=ON cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' -DWarpX_FFT=ON - embedded_boundary: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB='ON' + #embedded_boundary: + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB='ON' no_mpi: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI='OFF' python: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON='ON' -DWarpX_APP='OFF' - single_precision: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION='SINGLE' + #single_precision: + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION='SINGLE' # default: 60; maximum: 360 timeoutInMinutes: 240 From a899610cc749dcab649b7ea9cd9e2d2851c0e3e9 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 16:04:31 -0700 Subject: [PATCH 048/167] Fix BLAS++/LAPACK++ installation for RZ builds --- .azure-pipelines.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 52a553701b9..367210b83b8 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -34,14 +34,19 @@ jobs: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' -DWarpX_FFT=ON cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' -DWarpX_FFT=ON + WARPX_RZ_FFT: 'TRUE' #embedded_boundary: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB='ON' + # WARPX_RZ_FFT: 'TRUE' no_mpi: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI='OFF' + WARPX_RZ_FFT: 'TRUE' python: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON='ON' -DWarpX_APP='OFF' + WARPX_RZ_FFT: 'TRUE' #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION='SINGLE' + # WARPX_RZ_FFT: 'TRUE' # default: 60; maximum: 360 timeoutInMinutes: 240 @@ -102,14 +107,18 @@ jobs: # -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF # python3 -m pip install --upgrade openpmd-api #fi - if [ "${WARPX_CI_RZ_OR_NOMPI:-FALSE}" == "TRUE" ]; then - cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/blaspp.git \ + if [ "${WARPX_RZ_FFT:-FALSE}" == "TRUE" ]; then + # BLAS++ + cmake-easyinstall --prefix=/usr/local \ + git+https://github.com/icl-utk-edu/blaspp.git \ -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ -DCMAKE_CXX_STANDARD=17 \ -Duse_openmp=OFF -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON - cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/lapackpp.git \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_CXX_STANDARD=17 \ + # LAPACK++ + cmake-easyinstall --prefix=/usr/local \ + git+https://github.com/icl-utk-edu/lapackpp.git \ + -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + -DCMAKE_CXX_STANDARD=17 \ -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi # Python modules required for test analysis From 2c7d317532191f1b7ec7905dbe8251acffe87696 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 2 Aug 2024 16:27:20 -0700 Subject: [PATCH 049/167] Cleanup --- .azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 367210b83b8..2aab7b5d504 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -17,11 +17,11 @@ jobs: CMAKE_GENERATOR: 'Ninja' FFTW_HOME: '/usr' LAPACKPP_HOME: '/usr/local' - OMP_NUM_THREADS: 1 + #OMP_NUM_THREADS: 1 WARPX_CI_CCACHE: 'TRUE' - WARPX_CI_NUM_MAKE_JOBS: 2 - WARPX_CI_OPENPMD: 'TRUE' - WARPX_CI_TMP: '/tmp/ci' + #WARPX_CI_NUM_MAKE_JOBS: 2 + #WARPX_CI_OPENPMD: 'TRUE' + #WARPX_CI_TMP: '/tmp/ci' strategy: # FIXME uncomment all variants @@ -140,6 +140,6 @@ jobs: cmake --build build -j 2 # run tests ctest --test-dir build --output-on-failure - rm -rf ${WARPX_CI_TMP} + #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' From 29846f2c9bfc89b94dcafb95b4dc241f2361f4a1 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 09:29:37 -0700 Subject: [PATCH 050/167] Fix logic for Python tests --- .azure-pipelines.yml | 26 +++++++++++++------------- CMakeLists.txt | 2 +- Examples/CMakeLists.txt | 5 ++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2aab7b5d504..16bb07aa012 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -27,26 +27,26 @@ jobs: # FIXME uncomment all variants matrix: cartesian_1d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1' -DWarpX_FFT=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON cartesian_2d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='2' -DWarpX_FFT=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON cartesian_3d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='3' -DWarpX_FFT=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON cylindrical_rz: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='RZ' -DWarpX_FFT=ON - WARPX_RZ_FFT: 'TRUE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON + WARPX_RZ_FFT: "TRUE" #embedded_boundary: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB='ON' - # WARPX_RZ_FFT: 'TRUE' + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_EB=ON + # WARPX_RZ_FFT: "TRUE" no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI='OFF' - WARPX_RZ_FFT: 'TRUE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_RZ_FFT: "TRUE" python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON='ON' -DWarpX_APP='OFF' - WARPX_RZ_FFT: 'TRUE' + WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + WARPX_RZ_FFT: "TRUE" #single_precision: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION='SINGLE' - # WARPX_RZ_FFT: 'TRUE' + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE + # WARPX_RZ_FFT: "TRUE" # default: 60; maximum: 360 timeoutInMinutes: 240 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a8241e46c5..ade3c832f6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -794,7 +794,7 @@ endif() if(BUILD_TESTING) enable_testing() - if(WarpX_APP) + if(WarpX_APP OR WarpX_PYTHON) add_subdirectory(Examples) endif() endif() diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 2a134d2d075..6a4c49f50d1 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -41,10 +41,9 @@ function(add_warpx_test endif() # Python test? + set(python OFF) if(inputs MATCHES ".*\.py$") - set(python ON) - else() - set(python OFF) + set(python ON) endif() # cannot run Python tests w/o Python support From 897ec8fdcb5c2fb84a0564d29ea62ac17b0f759f Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 09:52:14 -0700 Subject: [PATCH 051/167] Add more Python tests --- Examples/Physics_applications/CMakeLists.txt | 1 + .../laser_acceleration/CMakeLists.txt | 11 +++++++++++ .../laser_acceleration/PICMI_inputs_1d.py | 8 ++------ Examples/Tests/CMakeLists.txt | 1 + Examples/Tests/gaussian_beam/CMakeLists.txt | 11 +++++++++++ .../Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py | 4 +--- Examples/Tests/langmuir/CMakeLists.txt | 11 +++++++++++ Examples/Tests/langmuir/PICMI_inputs_rz.py | 4 +--- 8 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 Examples/Physics_applications/laser_acceleration/CMakeLists.txt create mode 100644 Examples/Tests/gaussian_beam/CMakeLists.txt diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index ef9ca2e2294..d333fb15c09 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -2,3 +2,4 @@ # add_subdirectory(capacitive_discharge) +add_subdirectory(laser_acceleration) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt new file mode 100644 index 00000000000..2a95e3c0938 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -0,0 +1,11 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + Python_LaserAcceleration_1d # name + 1 # dims + ON # mpi + Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000100 # output +) diff --git a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py b/Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py index d8bdddfaca6..04530e549b6 100755 --- a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py +++ b/Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py @@ -81,16 +81,12 @@ diag_field_list = ['B', 'E', 'J', 'rho'] particle_diag = picmi.ParticleDiagnostic( name = 'diag1', - period = 100, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAcceleration_1d_plt') + period = 100) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 100, - data_list = diag_field_list, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAcceleration_1d_plt') + data_list = diag_field_list) # Set up simulation sim = picmi.Simulation( diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 42cbebe7f1c..546294c4f68 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(btd_rz) add_subdirectory(collider_relevant_diags) add_subdirectory(collision) +add_subdirectory(gaussian_beam) add_subdirectory(langmuir) add_subdirectory(nci_psatd_stability) add_subdirectory(single_particle) diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt new file mode 100644 index 00000000000..3dbd4908140 --- /dev/null +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -0,0 +1,11 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + Python_gaussian_beam # name + 3 # dims + ON # mpi + Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py b/Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py index b9d06034394..5d5a7422c0c 100755 --- a/Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py +++ b/Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py @@ -65,9 +65,7 @@ grid = grid, period = 10, data_list = args.fields_to_plot, - warpx_format = args.diagformat, - write_dir = '.', - warpx_file_prefix = 'Python_gaussian_beam_plt') + warpx_format = args.diagformat) part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = 10, diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 2b4bf6eccfd..2208d99f8eb 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -189,3 +189,14 @@ if(WarpX_FFT) diags/diag1000080 # output ) endif() + +# Python_Langmuir_rz_multimode ################################################ +# +add_warpx_test( + Python_Langmuir_rz_multimode # name + RZ # dims + ON # mpi + Examples/Tests/langmuir/PICMI_inputs_rz.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000040 # output +) diff --git a/Examples/Tests/langmuir/PICMI_inputs_rz.py b/Examples/Tests/langmuir/PICMI_inputs_rz.py index 8da03b00469..4c58af93890 100755 --- a/Examples/Tests/langmuir/PICMI_inputs_rz.py +++ b/Examples/Tests/langmuir/PICMI_inputs_rz.py @@ -104,9 +104,7 @@ field_diag1 = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = diagnostic_intervals, - data_list = ['Er', 'Ez', 'Bt', 'Jr', 'Jz', 'part_per_cell'], - write_dir = '.', - warpx_file_prefix = 'Python_Langmuir_rz_multimode_plt') + data_list = ['Er', 'Ez', 'Bt', 'Jr', 'Jz', 'part_per_cell']) part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_intervals, From 0808934b9d20b62921eaa2110a0d153bb7d7c8c3 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 10:36:35 -0700 Subject: [PATCH 052/167] Fix Azure pipeline YAML file --- .azure-pipelines.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 16bb07aa012..1468e8c0c85 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -34,19 +34,19 @@ jobs: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON - WARPX_RZ_FFT: "TRUE" + WARPX_RZ_FFT: 'TRUE' #embedded_boundary: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_EB=ON - # WARPX_RZ_FFT: "TRUE" + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB=ON + # WARPX_RZ_FFT: 'TRUE' no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_MPI=OFF - WARPX_RZ_FFT: "TRUE" + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_RZ_FFT: 'TRUE' python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF - WARPX_RZ_FFT: "TRUE" + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + WARPX_RZ_FFT: 'TRUE' #single_precision: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS="1;2;3;RZ" -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE - # WARPX_RZ_FFT: "TRUE" + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE + # WARPX_RZ_FFT: 'TRUE' # default: 60; maximum: 360 timeoutInMinutes: 240 From 274901bc17db2892da8eb4a3b19b04dcfbb27a7d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 10:52:01 -0700 Subject: [PATCH 053/167] Add more tests --- Examples/Tests/collision/CMakeLists.txt | 24 ++++- .../{inputs_1d => inputs_1d_test_collisionZ} | 0 .../{inputs_2d => inputs_2d_test_collisionXZ} | 1 + Examples/Tests/collision/inputs_3d_base | 98 ----------------- ...ation_base => inputs_3d_test_collisionISO} | 0 .../collision/inputs_3d_test_collisionXYZ | 100 +++++++++++++++++- .../Tests/nci_psatd_stability/CMakeLists.txt | 39 +++++++ .../{inputs_2d => inputs_2d_base} | 0 .../inputs_2d_test_galilean_2d_psatd | 8 ++ ..._test_galilean_2d_psatd_current_correction | 10 ++ ...t_galilean_2d_psatd_current_correction_psb | 8 ++ 11 files changed, 186 insertions(+), 102 deletions(-) rename Examples/Tests/collision/{inputs_1d => inputs_1d_test_collisionZ} (100%) rename Examples/Tests/collision/{inputs_2d => inputs_2d_test_collisionXZ} (98%) delete mode 100644 Examples/Tests/collision/inputs_3d_base rename Examples/Tests/collision/{inputs_3d_isotropization_base => inputs_3d_test_collisionISO} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd create mode 100644 Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction create mode 100644 Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index dabc5849b1b..9a97a218123 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -1,13 +1,24 @@ # Add tests (alphabetical order) ############################################## # +# collisionZ ################################################################## +# +add_warpx_test( + collisionZ # name + 1 # dims + ON # mpi + Examples/Tests/collision/inputs_1d_test_collisionZ # inputs + Examples/Tests/collision/analysis_collision_1d.py # analysis + diags/diag1000600 # output +) + # collisionISO ################################################################ # add_warpx_test( collisionISO # name 3 # dims OFF # mpi - Examples/Tests/collision/inputs_3d_isotropization_base # inputs + Examples/Tests/collision/inputs_3d_test_collisionISO # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output ) @@ -33,3 +44,14 @@ add_warpx_test( Examples/Tests/collision/analysis_collision_3d.py # analysis collisionXYZ_plt000150 # output ) + +# collisionXZ ################################################################# +# +add_warpx_test( + collisionXZ # name + 2 # dims + OFF # mpi + Examples/Tests/collision/inputs_2d_test_collisionXZ # inputs + Examples/Tests/collision/analysis_collision_2d.py # analysis + collisionXZ_plt000150 # output +) diff --git a/Examples/Tests/collision/inputs_1d b/Examples/Tests/collision/inputs_1d_test_collisionZ similarity index 100% rename from Examples/Tests/collision/inputs_1d rename to Examples/Tests/collision/inputs_1d_test_collisionZ diff --git a/Examples/Tests/collision/inputs_2d b/Examples/Tests/collision/inputs_2d_test_collisionXZ similarity index 98% rename from Examples/Tests/collision/inputs_2d rename to Examples/Tests/collision/inputs_2d_test_collisionXZ index 69d23dfb0c0..f2305f48667 100644 --- a/Examples/Tests/collision/inputs_2d +++ b/Examples/Tests/collision/inputs_2d_test_collisionXZ @@ -73,6 +73,7 @@ diagnostics.diags_names = diag1 diag_parser_filter diag_uniform_filter diag_rand diag1.intervals = 10 diag1.diag_type = Full diag1.fields_to_plot = Ex Ey Ez Bx By Bz +diag1.file_prefix = collisionXZ_plt ## diag_parser_filter is a diag used to test the particle filter function. diag_parser_filter.intervals = 150:150: diff --git a/Examples/Tests/collision/inputs_3d_base b/Examples/Tests/collision/inputs_3d_base deleted file mode 100644 index 11d6b150dd2..00000000000 --- a/Examples/Tests/collision/inputs_3d_base +++ /dev/null @@ -1,98 +0,0 @@ -################################# -####### GENERAL PARAMETERS ###### -################################# -max_step = 150 -amr.n_cell = 8 8 8 -amr.max_grid_size = 8 -amr.blocking_factor = 8 -amr.max_level = 0 -geometry.dims = 3 -geometry.prob_lo = 0. 0. 0. -geometry.prob_hi = 4.154046151855669e2 4.154046151855669e2 4.154046151855669e2 - -################################# -###### Boundary Condition ####### -################################# -boundary.field_lo = periodic periodic periodic -boundary.field_hi = periodic periodic periodic - -################################# -############ NUMERICS ########### -################################# -warpx.serialize_initial_conditions = 1 -warpx.verbose = 1 -warpx.const_dt = 1.224744871e-07 -warpx.random_seed = 2034958209 - -# Do not evolve the E and B fields -algo.maxwell_solver = none - -# Order of particle shape factors -algo.particle_shape = 1 - -################################# -############ PLASMA ############# -################################# -particles.species_names = electron ion - -electron.charge = -q_e -electron.mass = m_e -electron.injection_style = "NRandomPerCell" -electron.num_particles_per_cell = 200 -electron.profile = constant -electron.density = 1.0e21 -electron.momentum_distribution_type = "gaussian" -electron.ux_th = 0.044237441120300 -electron.uy_th = 0.044237441120300 -electron.uz_th = 0.044237441120300 -electron.ux_m = 0.044237441120300 - -ion.charge = q_e -ion.mass = 4.554691780000000e-30 -ion.injection_style = "NRandomPerCell" -ion.num_particles_per_cell = 200 -ion.profile = constant -ion.density = 1.0e21 -ion.momentum_distribution_type = "gaussian" -ion.ux_th = 0.006256118919701 -ion.uy_th = 0.006256118919701 -ion.uz_th = 0.006256118919701 - -################################# -############ COLLISION ########## -################################# -collisions.collision_names = collision1 collision2 collision3 -collision1.species = electron ion -collision2.species = electron electron -collision3.species = ion ion -collision1.CoulombLog = 15.9 -collision2.CoulombLog = 15.9 -collision3.CoulombLog = 15.9 -collision1.ndt = 10 -collision2.ndt = 10 -collision3.ndt = 10 - -# Diagnostics -diagnostics.diags_names = diag1 diag_parser_filter diag_uniform_filter diag_random_filter -diag1.intervals = 10 -diag1.diag_type = Full -diag1.fields_to_plot = Ex Ey Ez Bx By Bz T_electron T_ion - -## diag_parser_filter is a diag used to test the particle filter function. -diag_parser_filter.intervals = 150:150: -diag_parser_filter.diag_type = Full -diag_parser_filter.species = electron -diag_parser_filter.electron.plot_filter_function(t,x,y,z,ux,uy,uz) = "(ux*uy*uz < 0) * - (sqrt(x**2+y**2+z**2)<100)" - -## diag_uniform_filter is a diag used to test the particle uniform filter. -diag_uniform_filter.intervals = 150:150: -diag_uniform_filter.diag_type = Full -diag_uniform_filter.species = electron -diag_uniform_filter.electron.uniform_stride = 11 - -## diag_random_filter is a diag used to test the particle random filter. -diag_random_filter.intervals = 150:150: -diag_random_filter.diag_type = Full -diag_random_filter.species = electron -diag_random_filter.electron.random_fraction = 0.88 diff --git a/Examples/Tests/collision/inputs_3d_isotropization_base b/Examples/Tests/collision/inputs_3d_test_collisionISO similarity index 100% rename from Examples/Tests/collision/inputs_3d_isotropization_base rename to Examples/Tests/collision/inputs_3d_test_collisionISO diff --git a/Examples/Tests/collision/inputs_3d_test_collisionXYZ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ index d096a9cc49f..8aa0fc3fb7b 100644 --- a/Examples/Tests/collision/inputs_3d_test_collisionXYZ +++ b/Examples/Tests/collision/inputs_3d_test_collisionXYZ @@ -1,5 +1,99 @@ -# base input parameters -FILE = inputs_3d_base +################################# +####### GENERAL PARAMETERS ###### +################################# +max_step = 150 +amr.n_cell = 8 8 8 +amr.max_grid_size = 8 +amr.blocking_factor = 8 +amr.max_level = 0 +geometry.dims = 3 +geometry.prob_lo = 0. 0. 0. +geometry.prob_hi = 4.154046151855669e2 4.154046151855669e2 4.154046151855669e2 -# test input parameters +################################# +###### Boundary Condition ####### +################################# +boundary.field_lo = periodic periodic periodic +boundary.field_hi = periodic periodic periodic + +################################# +############ NUMERICS ########### +################################# +warpx.serialize_initial_conditions = 1 +warpx.verbose = 1 +warpx.const_dt = 1.224744871e-07 +warpx.random_seed = 2034958209 + +# Do not evolve the E and B fields +algo.maxwell_solver = none + +# Order of particle shape factors +algo.particle_shape = 1 + +################################# +############ PLASMA ############# +################################# +particles.species_names = electron ion + +electron.charge = -q_e +electron.mass = m_e +electron.injection_style = "NRandomPerCell" +electron.num_particles_per_cell = 200 +electron.profile = constant +electron.density = 1.0e21 +electron.momentum_distribution_type = "gaussian" +electron.ux_th = 0.044237441120300 +electron.uy_th = 0.044237441120300 +electron.uz_th = 0.044237441120300 +electron.ux_m = 0.044237441120300 + +ion.charge = q_e +ion.mass = 4.554691780000000e-30 +ion.injection_style = "NRandomPerCell" +ion.num_particles_per_cell = 200 +ion.profile = constant +ion.density = 1.0e21 +ion.momentum_distribution_type = "gaussian" +ion.ux_th = 0.006256118919701 +ion.uy_th = 0.006256118919701 +ion.uz_th = 0.006256118919701 + +################################# +############ COLLISION ########## +################################# +collisions.collision_names = collision1 collision2 collision3 +collision1.species = electron ion +collision2.species = electron electron +collision3.species = ion ion +collision1.CoulombLog = 15.9 +collision2.CoulombLog = 15.9 +collision3.CoulombLog = 15.9 +collision1.ndt = 10 +collision2.ndt = 10 +collision3.ndt = 10 + +# Diagnostics +diagnostics.diags_names = diag1 diag_parser_filter diag_uniform_filter diag_random_filter +diag1.intervals = 10 +diag1.diag_type = Full +diag1.fields_to_plot = Ex Ey Ez Bx By Bz T_electron T_ion diag1.file_prefix = collisionXYZ_plt + +## diag_parser_filter is a diag used to test the particle filter function. +diag_parser_filter.intervals = 150:150: +diag_parser_filter.diag_type = Full +diag_parser_filter.species = electron +diag_parser_filter.electron.plot_filter_function(t,x,y,z,ux,uy,uz) = "(ux*uy*uz < 0) * + (sqrt(x**2+y**2+z**2)<100)" + +## diag_uniform_filter is a diag used to test the particle uniform filter. +diag_uniform_filter.intervals = 150:150: +diag_uniform_filter.diag_type = Full +diag_uniform_filter.species = electron +diag_uniform_filter.electron.uniform_stride = 11 + +## diag_random_filter is a diag used to test the particle random filter. +diag_random_filter.intervals = 150:150: +diag_random_filter.diag_type = Full +diag_random_filter.species = electron +diag_random_filter.electron.random_fraction = 0.88 diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 983fab18b14..9376893062b 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -52,3 +52,42 @@ if(WarpX_FFT) diags/diag1000160 # output ) endif() + +# galilean_2d_psatd ########################################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_2d_psatd # name + 2 # dims + OFF # mpi + Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# galilean_2d_psatd_current_correction ######################################## +# +if(WarpX_FFT) + add_warpx_test( + galilean_2d_psatd_current_correction # name + 2 # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# galilean_2d_psatd_current_correction_psb #################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_2d_psatd_current_correction_psb # name + 2 # dims + OFF # mpi + Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d b/Examples/Tests/nci_psatd_stability/inputs_2d_base similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_2d rename to Examples/Tests/nci_psatd_stability/inputs_2d_base diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd new file mode 100644 index 00000000000..df434fb2a32 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_2d_base + +# test input paramters +algo.current_deposition = direct +psatd.current_correction = 0 +warpx.grid_type = collocated +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction new file mode 100644 index 00000000000..421115ec98e --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction @@ -0,0 +1,10 @@ +# base input parameters +FILE = inputs_2d_base + +# test input paramters +amr.blocking_factor = 64 +amr.max_grid_size = 64 +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 0 +psatd.update_with_rho = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb new file mode 100644 index 00000000000..bd6572763a8 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_2d_base + +# test input paramters +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +psatd.update_with_rho = 0 From 1e0f51480803767667c541cde83fb635de10a86a Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 13:31:25 -0700 Subject: [PATCH 054/167] More Azure matrix elements --- .azure-pipelines.yml | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 1468e8c0c85..dc13f91a08e 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -26,24 +26,40 @@ jobs: strategy: # FIXME uncomment all variants matrix: + # Cartesian 1D cartesian_1d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON + cartesian_1d_python: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + cartesian_1d_no_mpi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_MPI=OFF + # Cartesian 2D cartesian_2d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON + cartesian_2d_python: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + cartesian_2d_no_mpi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_MPI=OFF + # Cartesian 3D cartesian_3d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON + cartesian_3d_python: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + cartesian_3d_no_mpi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_MPI=OFF + # Cylindrical RZ cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON WARPX_RZ_FFT: 'TRUE' + cylindrical_rz_python: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + WARPX_RZ_FFT: 'TRUE' + cylindrical_rz_no_mpi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_RZ_FFT: 'TRUE' #embedded_boundary: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB=ON # WARPX_RZ_FFT: 'TRUE' - no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_MPI=OFF - WARPX_RZ_FFT: 'TRUE' - python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF - WARPX_RZ_FFT: 'TRUE' #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE # WARPX_RZ_FFT: 'TRUE' From fd388788454e6a1eeedd71d8c9923d0882e4c364 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 14:12:43 -0700 Subject: [PATCH 055/167] Add more tests --- Examples/Tests/nci_psatd_stability/CMakeLists.txt | 13 +++++++++++++ ...brid => inputs_2d_test_galilean_2d_psatd_hybrid} | 2 ++ 2 files changed, 15 insertions(+) rename Examples/Tests/nci_psatd_stability/{inputs_2d_hybrid => inputs_2d_test_galilean_2d_psatd_hybrid} (97%) diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 9376893062b..2373c301f13 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -91,3 +91,16 @@ if(WarpX_FFT) diags/diag1000400 # output ) endif() + +# galilean_2d_psatd_hybrid #################################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_2d_psatd_hybrid # name + 2 # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000400 # output + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_hybrid b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid similarity index 97% rename from Examples/Tests/nci_psatd_stability/inputs_2d_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid index 90dfd58c4ae..501c964353f 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_2d_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid @@ -21,6 +21,7 @@ algo.particle_pusher = vay algo.particle_shape = 3 psatd.use_default_v_galilean = 1 +psatd.current_correction = 0 warpx.cfl = 1. @@ -38,6 +39,7 @@ warpx.use_filter = 1 warpx.serialize_initial_conditions = 1 warpx.verbose = 1 +warpx.abort_on_warning_threshold = medium particles.species_names = electrons ions beam particles.use_fdtd_nci_corr = 0 From 9a255b91021ead1676b1a5ceb1900b1a99838357 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 14:15:41 -0700 Subject: [PATCH 056/167] Exclude `pytest.AMReX` when running Python tests --- .azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index dc13f91a08e..07601f5dd96 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -154,8 +154,8 @@ jobs: cmake -S . -B build ${WARPX_CMAKE_FLAGS} # build cmake --build build -j 2 - # run tests - ctest --test-dir build --output-on-failure + # run tests (exclude pytest.AMReX when running Python tests) + ctest --test-dir build --output-on-failure -E AMReX #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' From 036d6afdb4e0e12e56c90f44b8378b8beea7fc2a Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 14:25:07 -0700 Subject: [PATCH 057/167] Add `periodictable` to requirements --- Regression/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Regression/requirements.txt b/Regression/requirements.txt index 5bdd04ba106..d2df1fec75e 100644 --- a/Regression/requirements.txt +++ b/Regression/requirements.txt @@ -6,5 +6,6 @@ numpy openpmd-api openpmd-viewer pandas +periodictable scipy yt From 14113e0b4ad2105397937a9b2b52f733ba046682 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 14:53:21 -0700 Subject: [PATCH 058/167] Add more tests --- .../Tests/nci_psatd_stability/CMakeLists.txt | 39 +++++++++++++++++++ .../{inputs_3d => inputs_3d_base} | 0 .../inputs_3d_test_galilean_3d_psatd | 7 ++++ ..._test_galilean_3d_psatd_current_correction | 10 +++++ ...t_galilean_3d_psatd_current_correction_psb | 10 +++++ 5 files changed, 66 insertions(+) rename Examples/Tests/nci_psatd_stability/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd create mode 100644 Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction create mode 100644 Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 2373c301f13..989099a3e0b 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -104,3 +104,42 @@ if(WarpX_FFT) diags/diag1000400 # output ) endif() + +# galilean_3d_psatd ########################################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_3d_psatd # name + 3 # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000300 # output + ) +endif() + +# galilean_3d_psatd_current_correction ######################################## +# +if(WarpX_FFT) + add_warpx_test( + galilean_3d_psatd_current_correction # name + 3 # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000300 # output + ) +endif() + +# galilean_3d_psatd_current_correction_psb #################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_3d_psatd_current_correction_psb # name + 3 # dims + OFF # mpi + Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000300 # output + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d b/Examples/Tests/nci_psatd_stability/inputs_3d_base similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_3d rename to Examples/Tests/nci_psatd_stability/inputs_3d_base diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd new file mode 100644 index 00000000000..f685af7600c --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +psatd.current_correction = 0 +psatd.v_galilean = 0. 0. 0.99498743710662 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction new file mode 100644 index 00000000000..6b584f25ba2 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction @@ -0,0 +1,10 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 0 +psatd.update_with_rho = 0 +psatd.v_galilean = 0. 0. 0.99498743710662 +warpx.numprocs = 1 1 2 diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb new file mode 100644 index 00000000000..9674ce6734e --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb @@ -0,0 +1,10 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +psatd.v_galilean = 0. 0. 0.99498743710662 +psatd.update_with_rho = 0 +warpx.numprocs = 1 1 1 From fef7d16e9a8f83f7197c10019bdf90f6d446402e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 15:15:08 -0700 Subject: [PATCH 059/167] Add `picmistandard` to requirements --- Regression/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Regression/requirements.txt b/Regression/requirements.txt index d2df1fec75e..b0b8ef40106 100644 --- a/Regression/requirements.txt +++ b/Regression/requirements.txt @@ -7,5 +7,6 @@ openpmd-api openpmd-viewer pandas periodictable +picmistandard scipy yt From c20eff7b339e57407abc82948cf63595131ff3be Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 5 Aug 2024 17:16:32 -0700 Subject: [PATCH 060/167] Add more tests --- .../Tests/nci_psatd_stability/CMakeLists.txt | 39 +++++++++++++++++++ .../{inputs_rz => inputs_rz_base} | 0 .../inputs_rz_test_galilean_rz_psatd | 8 ++++ ..._test_galilean_rz_psatd_current_correction | 8 ++++ ...t_galilean_rz_psatd_current_correction_psb | 8 ++++ 5 files changed, 63 insertions(+) rename Examples/Tests/nci_psatd_stability/{inputs_rz => inputs_rz_base} (100%) create mode 100644 Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd create mode 100644 Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction create mode 100644 Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 989099a3e0b..bf4f0a595fb 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -143,3 +143,42 @@ if(WarpX_FFT) diags/diag1000300 # output ) endif() + +# galilean_rz_psatd ########################################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_rz_psatd # name + RZ # dims + OFF # mpi + Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# galilean_rz_psatd_current_correction ######################################## +# +if(WarpX_FFT) + add_warpx_test( + galilean_rz_psatd_current_correction # name + RZ # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() + +# galilean_rz_psatd_current_correction_psb #################################### +# +if(WarpX_FFT) + add_warpx_test( + galilean_rz_psatd_current_correction_psb # name + RZ # dims + OFF # mpi + Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + diags/diag1000400 # output + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz b/Examples/Tests/nci_psatd_stability/inputs_rz_base similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_rz rename to Examples/Tests/nci_psatd_stability/inputs_rz_base diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd new file mode 100644 index 00000000000..46564313045 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_rz_base + +# test input paramters +electrons.random_theta = 0 +ions.random_theta = 0 +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction new file mode 100644 index 00000000000..46564313045 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_rz_base + +# test input paramters +electrons.random_theta = 0 +ions.random_theta = 0 +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb new file mode 100644 index 00000000000..3ba3503686a --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_rz_base + +# test input paramters +electrons.random_theta = 0 +ions.random_theta = 0 +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 From 1d9643a5a78cd865449041df3d2d67c891656ff3 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 7 Aug 2024 09:58:34 -0700 Subject: [PATCH 061/167] Fix broken test, remove build directory --- .azure-pipelines.yml | 2 ++ .../inputs_rz_test_galilean_rz_psatd_current_correction | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 07601f5dd96..c6a22138ffe 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -148,6 +148,7 @@ jobs: displayName: 'Install dependencies' - bash: | + # FIXME remove unused variables/commands set -eu -o pipefail df -h # configure @@ -156,6 +157,7 @@ jobs: cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) ctest --test-dir build --output-on-failure -E AMReX + rm -rf build #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction index 46564313045..29018865cae 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction +++ b/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction @@ -2,7 +2,9 @@ FILE = inputs_rz_base # test input paramters +amr.blocking_factor = 32 +amr.max_grid_size = 32 electrons.random_theta = 0 ions.random_theta = 0 -psatd.current_correction = 0 -warpx.abort_on_warning_threshold = medium +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 0 From 2e68590b3f59641bd4b9a2c93279feddbdd05b70 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni <59625522+EZoni@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:21:00 -0700 Subject: [PATCH 062/167] Clear pip cache --- .azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c6a22138ffe..51d525f2df7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -139,6 +139,7 @@ jobs: fi # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt + python3 -m pip cache purge # external repositories required for test analysis cd .. git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git From 116376351fb691b2d291be020d834c278c8cbee2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 7 Aug 2024 15:17:31 -0700 Subject: [PATCH 063/167] Clean up input file names --- Examples/Tests/btd_rz/CMakeLists.txt | 2 +- .../{inputs_rz_z_boosted_BTD_base => inputs_rz_test_BTD_rz} | 0 Examples/Tests/collider_relevant_diags/CMakeLists.txt | 2 +- .../collider_relevant_diags/analysis_multiple_particles.py | 2 +- .../inputs_3d_multiple_particles_test_collider_diagnostics | 5 ----- ...le_particles_base => inputs_3d_test_collider_diagnostics} | 1 + Examples/Tests/collision/CMakeLists.txt | 2 +- .../collision/{inputs_rz_base => inputs_rz_test_collisionRZ} | 0 Examples/Tests/single_particle/CMakeLists.txt | 2 +- .../{inputs_2d_base => inputs_2d_test_bilinear_filter} | 0 10 files changed, 6 insertions(+), 10 deletions(-) rename Examples/Tests/btd_rz/{inputs_rz_z_boosted_BTD_base => inputs_rz_test_BTD_rz} (100%) delete mode 100644 Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics rename Examples/Tests/collider_relevant_diags/{inputs_3d_multiple_particles_base => inputs_3d_test_collider_diagnostics} (99%) rename Examples/Tests/collision/{inputs_rz_base => inputs_rz_test_collisionRZ} (100%) rename Examples/Tests/single_particle/{inputs_2d_base => inputs_2d_test_bilinear_filter} (100%) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 56036305dac..beda624b6e7 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -7,7 +7,7 @@ add_warpx_test( BTD_rz # name RZ # dims ON # mpi - Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base # inputs + Examples/Tests/btd_rz/inputs_rz_test_BTD_rz # inputs Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output ) diff --git a/Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base b/Examples/Tests/btd_rz/inputs_rz_test_BTD_rz similarity index 100% rename from Examples/Tests/btd_rz/inputs_rz_z_boosted_BTD_base rename to Examples/Tests/btd_rz/inputs_rz_test_BTD_rz diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index 7128b5f7749..021c803b70d 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -7,7 +7,7 @@ add_warpx_test( collider_diagnostics # name 3 # dims ON # mpi - Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics # inputs + Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py index 053dd2458e8..aa0105066fe 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py @@ -54,7 +54,7 @@ def dL_dt(): lumi.append(l) return lumi -input_dict = parse_input_file('inputs_3d_multiple_particles_base') +input_dict = parse_input_file('inputs_3d_test_collider_diagnostics') Ex, Ey, Ez = [float(w) for w in input_dict['particles.E_external_particle']] Bx, By, Bz = [float(w) for w in input_dict['particles.B_external_particle']] diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics b/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics deleted file mode 100644 index 595b05db24f..00000000000 --- a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_test_collider_diagnostics +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_multiple_particles_base - -# test input parameters -warpx.abort_on_warning_threshold = high diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base b/Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics similarity index 99% rename from Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base rename to Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics index 1efc68c33b0..d88e0b767d6 100644 --- a/Examples/Tests/collider_relevant_diags/inputs_3d_multiple_particles_base +++ b/Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics @@ -18,6 +18,7 @@ geometry.prob_lo = 0 0 0 geometry.prob_hi = 8 8 8 particles.do_tiling = 0 warpx.use_filter = 0 +warpx.abort_on_warning_threshold = high ################################# ######## BOUNDARY CONDITION ##### diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 9a97a218123..ca04cfbb5fa 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -29,7 +29,7 @@ add_warpx_test( collisionRZ # name RZ # dims OFF # mpi - Examples/Tests/collision/inputs_rz_base # inputs + Examples/Tests/collision/inputs_rz_test_collisionRZ # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output ) diff --git a/Examples/Tests/collision/inputs_rz_base b/Examples/Tests/collision/inputs_rz_test_collisionRZ similarity index 100% rename from Examples/Tests/collision/inputs_rz_base rename to Examples/Tests/collision/inputs_rz_test_collisionRZ diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 985f25b253b..fdde6f619dc 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -7,7 +7,7 @@ add_warpx_test( bilinear_filter # name 2 # dims ON # mpi - Examples/Tests/single_particle/inputs_2d_base # inputs + Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/single_particle/inputs_2d_base b/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter similarity index 100% rename from Examples/Tests/single_particle/inputs_2d_base rename to Examples/Tests/single_particle/inputs_2d_test_bilinear_filter From b93908acaeec0b042763744c5f0c1a7102fba0a5 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 8 Aug 2024 14:26:20 -0700 Subject: [PATCH 064/167] Add more tests --- Examples/Tests/CMakeLists.txt | 9 +++ .../Tests/accelerator_lattice/CMakeLists.txt | 35 ++++++++++ .../analysis.py | 0 .../inputs_3d_test_hard_edged_quadrupoles} | 0 ...ts_3d_test_hard_edged_quadrupoles_boosted} | 0 ...uts_3d_test_hard_edged_quadrupoles_moving} | 0 Examples/Tests/boosted_diags/CMakeLists.txt | 13 ++++ ... => inputs_3d_test_laser_acceleration_btd} | 0 Examples/Tests/boundaries/CMakeLists.txt | 13 ++++ ... => inputs_3d_test_particle_boundaries_3d} | 0 Examples/Tests/collision/CMakeLists.txt | 45 +++++++----- ..._collisionZ => inputs_1d_test_collision_z} | 0 ...ollisionXZ => inputs_2d_test_collision_xz} | 0 ...y => inputs_2d_test_collision_xz_picmi.py} | 4 +- ...lisionISO => inputs_3d_test_collision_iso} | 0 ...lisionXYZ => inputs_3d_test_collision_xyz} | 0 ...ollisionRZ => inputs_rz_test_collision_rz} | 0 Examples/Tests/divb_cleaning/CMakeLists.txt | 13 ++++ Examples/Tests/divb_cleaning/analysis.py | 4 +- ...uts_3d => inputs_3d_test_divb_cleaning_3d} | 0 Examples/Tests/dive_cleaning/CMakeLists.txt | 24 +++++++ .../inputs_2d_test_dive_cleaning_2d | 5 ++ .../{inputs_3d => inputs_3d_base} | 1 - .../inputs_3d_test_dive_cleaning_3d | 5 ++ .../electrostatic_dirichlet_bc/CMakeLists.txt | 24 +++++++ ...{inputs_2d => inputs_2d_test_dirichlet_bc} | 0 ...y => inputs_2d_test_dirichlet_bc_picmi.py} | 0 .../Tests/electrostatic_sphere/CMakeLists.txt | 57 ++++++++++++++++ .../{inputs_3d => inputs_3d_base} | 0 .../inputs_3d_test_electrostatic_sphere | 5 ++ ...uts_3d_test_electrostatic_sphere_lab_frame | 6 ++ ...electrostatic_sphere_lab_frame_MR_emass_10 | 13 ++++ ...uts_3d_test_electrostatic_sphere_rel_nodal | 6 ++ ...=> inputs_rz_test_electrostatic_sphere_rz} | 1 + .../CMakeLists.txt | 13 ++++ ..._2d_test_energy_conserving_thermal_plasma} | 0 .../Tests/nci_psatd_stability/CMakeLists.txt | 13 ++++ .../inputs_2d_test_comoving_2d_psatd_hybrid} | 2 + Examples/Tests/nuclear_fusion/CMakeLists.txt | 68 +++++++++++++++++++ ... => inputs_2d_test_Proton_Boron_Fusion_2D} | 0 ...uts_3d_test_Deuterium_Deuterium_Fusion_3D} | 0 ...euterium_Deuterium_Fusion_3D_intraspecies} | 0 ...nputs_3d_test_Deuterium_Tritium_Fusion_3D} | 0 ... => inputs_3d_test_Proton_Boron_Fusion_3D} | 0 ...nputs_rz_test_Deuterium_Tritium_Fusion_RZ} | 0 .../{collisionISO.json => collision_iso.json} | 0 .../{collisionRZ.json => collision_rz.json} | 0 .../{collisionXYZ.json => collision_xyz.json} | 0 .../{collisionXZ.json => collision_xz.json} | 0 .../{collisionZ.json => collision_z.json} | 0 ...cSphere.json => electrostatic_sphere.json} | 0 ...on => electrostatic_sphere_lab_frame.json} | 0 ...ostatic_sphere_lab_frame_MR_emass_10.json} | 0 ...on => electrostatic_sphere_rel_nodal.json} | 0 ...reRZ.json => electrostatic_sphere_rz.json} | 0 ... => energy_conserving_thermal_plasma.json} | 0 ...n_BTD.json => laser_acceleration_btd.json} | 0 57 files changed, 357 insertions(+), 22 deletions(-) create mode 100644 Examples/Tests/accelerator_lattice/CMakeLists.txt rename Examples/Tests/{AcceleratorLattice => accelerator_lattice}/analysis.py (100%) rename Examples/Tests/{AcceleratorLattice/inputs_quad_3d => accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles} (100%) rename Examples/Tests/{AcceleratorLattice/inputs_quad_boosted_3d => accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted} (100%) rename Examples/Tests/{AcceleratorLattice/inputs_quad_moving_3d => accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving} (100%) create mode 100644 Examples/Tests/boosted_diags/CMakeLists.txt rename Examples/Tests/boosted_diags/{inputs_3d => inputs_3d_test_laser_acceleration_btd} (100%) create mode 100644 Examples/Tests/boundaries/CMakeLists.txt rename Examples/Tests/boundaries/{inputs_3d => inputs_3d_test_particle_boundaries_3d} (100%) rename Examples/Tests/collision/{inputs_1d_test_collisionZ => inputs_1d_test_collision_z} (100%) rename Examples/Tests/collision/{inputs_2d_test_collisionXZ => inputs_2d_test_collision_xz} (100%) rename Examples/Tests/collision/{PICMI_inputs_2d.py => inputs_2d_test_collision_xz_picmi.py} (97%) rename Examples/Tests/collision/{inputs_3d_test_collisionISO => inputs_3d_test_collision_iso} (100%) rename Examples/Tests/collision/{inputs_3d_test_collisionXYZ => inputs_3d_test_collision_xyz} (100%) rename Examples/Tests/collision/{inputs_rz_test_collisionRZ => inputs_rz_test_collision_rz} (100%) create mode 100644 Examples/Tests/divb_cleaning/CMakeLists.txt rename Examples/Tests/divb_cleaning/{inputs_3d => inputs_3d_test_divb_cleaning_3d} (100%) create mode 100644 Examples/Tests/dive_cleaning/CMakeLists.txt create mode 100644 Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d rename Examples/Tests/dive_cleaning/{inputs_3d => inputs_3d_base} (97%) create mode 100644 Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d create mode 100644 Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt rename Examples/Tests/electrostatic_dirichlet_bc/{inputs_2d => inputs_2d_test_dirichlet_bc} (100%) rename Examples/Tests/electrostatic_dirichlet_bc/{PICMI_inputs_2d.py => inputs_2d_test_dirichlet_bc_picmi.py} (100%) create mode 100644 Examples/Tests/electrostatic_sphere/CMakeLists.txt rename Examples/Tests/electrostatic_sphere/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere create mode 100644 Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame create mode 100644 Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 create mode 100644 Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal rename Examples/Tests/electrostatic_sphere/{inputs_rz => inputs_rz_test_electrostatic_sphere_rz} (96%) create mode 100644 Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt rename Examples/Tests/energy_conserving_thermal_plasma/{inputs_2d_electrostatic => inputs_2d_test_energy_conserving_thermal_plasma} (100%) rename Examples/Tests/{comoving/inputs_2d_hybrid => nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid} (97%) create mode 100644 Examples/Tests/nuclear_fusion/CMakeLists.txt rename Examples/Tests/nuclear_fusion/{inputs_proton_boron_2d => inputs_2d_test_Proton_Boron_Fusion_2D} (100%) rename Examples/Tests/nuclear_fusion/{inputs_deuterium_deuterium_3d => inputs_3d_test_Deuterium_Deuterium_Fusion_3D} (100%) rename Examples/Tests/nuclear_fusion/{inputs_deuterium_deuterium_3d_intraspecies => inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies} (100%) rename Examples/Tests/nuclear_fusion/{inputs_deuterium_tritium_3d => inputs_3d_test_Deuterium_Tritium_Fusion_3D} (100%) rename Examples/Tests/nuclear_fusion/{inputs_proton_boron_3d => inputs_3d_test_Proton_Boron_Fusion_3D} (100%) rename Examples/Tests/nuclear_fusion/{inputs_deuterium_tritium_rz => inputs_rz_test_Deuterium_Tritium_Fusion_RZ} (100%) rename Regression/Checksum/benchmarks_json/{collisionISO.json => collision_iso.json} (100%) rename Regression/Checksum/benchmarks_json/{collisionRZ.json => collision_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{collisionXYZ.json => collision_xyz.json} (100%) rename Regression/Checksum/benchmarks_json/{collisionXZ.json => collision_xz.json} (100%) rename Regression/Checksum/benchmarks_json/{collisionZ.json => collision_z.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphere.json => electrostatic_sphere.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereLabFrame.json => electrostatic_sphere_lab_frame.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereLabFrame_MR_emass_10.json => electrostatic_sphere_lab_frame_MR_emass_10.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereRelNodal.json => electrostatic_sphere_rel_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereRZ.json => electrostatic_sphere_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{EnergyConservingThermalPlasma.json => energy_conserving_thermal_plasma.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration_BTD.json => laser_acceleration_btd.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 546294c4f68..1fa4e7025a9 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -1,10 +1,19 @@ # Add tests (alphabetical order) ############################################## # +add_subdirectory(accelerator_lattice) +add_subdirectory(boosted_diags) +add_subdirectory(boundaries) add_subdirectory(btd_rz) add_subdirectory(collider_relevant_diags) add_subdirectory(collision) +add_subdirectory(divb_cleaning) +add_subdirectory(dive_cleaning) +add_subdirectory(electrostatic_dirichlet_bc) +add_subdirectory(electrostatic_sphere) +add_subdirectory(energy_conserving_thermal_plasma) add_subdirectory(gaussian_beam) add_subdirectory(langmuir) +add_subdirectory(nuclear_fusion) add_subdirectory(nci_psatd_stability) add_subdirectory(single_particle) diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt new file mode 100644 index 00000000000..d0def7f512f --- /dev/null +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# hard_edged_quadrupoles ###################################################### +# +add_warpx_test( + hard_edged_quadrupoles # name + 3 # dims + ON # mpi + Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles # inputs + Examples/Tests/accelerator_lattice/analysis.py # analysis + diags/diag1000050 # output +) + +# hard_edged_quadrupoles_boosted ############################################## +# +add_warpx_test( + hard_edged_quadrupoles_boosted # name + 3 # dims + ON # mpi + Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted # inputs + Examples/Tests/accelerator_lattice/analysis.py # analysis + diags/diag1000050 # output +) + +# hard_edged_quadrupoles_moving ############################################### +# +add_warpx_test( + hard_edged_quadrupoles_moving # name + 3 # dims + ON # mpi + Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving # inputs + Examples/Tests/accelerator_lattice/analysis.py # analysis + diags/diag1000050 # output +) diff --git a/Examples/Tests/AcceleratorLattice/analysis.py b/Examples/Tests/accelerator_lattice/analysis.py similarity index 100% rename from Examples/Tests/AcceleratorLattice/analysis.py rename to Examples/Tests/accelerator_lattice/analysis.py diff --git a/Examples/Tests/AcceleratorLattice/inputs_quad_3d b/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles similarity index 100% rename from Examples/Tests/AcceleratorLattice/inputs_quad_3d rename to Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles diff --git a/Examples/Tests/AcceleratorLattice/inputs_quad_boosted_3d b/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted similarity index 100% rename from Examples/Tests/AcceleratorLattice/inputs_quad_boosted_3d rename to Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted diff --git a/Examples/Tests/AcceleratorLattice/inputs_quad_moving_3d b/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving similarity index 100% rename from Examples/Tests/AcceleratorLattice/inputs_quad_moving_3d rename to Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt new file mode 100644 index 00000000000..84b78c9bad7 --- /dev/null +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# laser_acceleration_btd ###################################################### +# +add_warpx_test( + laser_acceleration_btd # name + 3 # dims + ON # mpi + Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd # inputs + Examples/Tests/boosted_diags/analysis.py # analysis + diags/diag1000003 # output +) diff --git a/Examples/Tests/boosted_diags/inputs_3d b/Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd similarity index 100% rename from Examples/Tests/boosted_diags/inputs_3d rename to Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt new file mode 100644 index 00000000000..56614ac513f --- /dev/null +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_boundaries_3d ###################################################### +# +add_warpx_test( + particle_boundaries_3d # name + 3 # dims + ON # mpi + Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d # inputs + Examples/Tests/boundaries/analysis.py # analysis + diags/diag1000008 # output +) diff --git a/Examples/Tests/boundaries/inputs_3d b/Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d similarity index 100% rename from Examples/Tests/boundaries/inputs_3d rename to Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index ca04cfbb5fa..348efad1be8 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -1,57 +1,68 @@ # Add tests (alphabetical order) ############################################## # -# collisionZ ################################################################## +# collision_z ################################################################# # add_warpx_test( - collisionZ # name + collision_z # name 1 # dims ON # mpi - Examples/Tests/collision/inputs_1d_test_collisionZ # inputs + Examples/Tests/collision/inputs_1d_test_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output ) -# collisionISO ################################################################ +# collision_iso ############################################################### # add_warpx_test( - collisionISO # name + collision_iso # name 3 # dims OFF # mpi - Examples/Tests/collision/inputs_3d_test_collisionISO # inputs + Examples/Tests/collision/inputs_3d_test_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output ) -# collisionRZ ################################################################# +# collision_rz ################################################################ # add_warpx_test( - collisionRZ # name + collision_rz # name RZ # dims OFF # mpi - Examples/Tests/collision/inputs_rz_test_collisionRZ # inputs + Examples/Tests/collision/inputs_rz_test_collision_rz # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output ) -# collisionXYZ ################################################################ +# collision_xyz ############################################################### # add_warpx_test( - collisionXYZ # name + collision_xyz # name 3 # dims OFF # mpi - Examples/Tests/collision/inputs_3d_test_collisionXYZ # inputs + Examples/Tests/collision/inputs_3d_test_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis - collisionXYZ_plt000150 # output + collision_xyz_plt000150 # output ) -# collisionXZ ################################################################# +# collision_xz ################################################################ # add_warpx_test( - collisionXZ # name + collision_xz # name 2 # dims OFF # mpi - Examples/Tests/collision/inputs_2d_test_collisionXZ # inputs + Examples/Tests/collision/inputs_2d_test_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis - collisionXZ_plt000150 # output + collision_xz_plt000150 # output +) + +# collision_xz_picmi ########################################################## +# +add_warpx_test( + collision_xz_picmi # name + 2 # dims + OFF # mpi + Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py # inputs + Examples/Tests/collision/analysis_collision_2d.py # analysis + collision_xz_plt000150 # output ) diff --git a/Examples/Tests/collision/inputs_1d_test_collisionZ b/Examples/Tests/collision/inputs_1d_test_collision_z similarity index 100% rename from Examples/Tests/collision/inputs_1d_test_collisionZ rename to Examples/Tests/collision/inputs_1d_test_collision_z diff --git a/Examples/Tests/collision/inputs_2d_test_collisionXZ b/Examples/Tests/collision/inputs_2d_test_collision_xz similarity index 100% rename from Examples/Tests/collision/inputs_2d_test_collisionXZ rename to Examples/Tests/collision/inputs_2d_test_collision_xz diff --git a/Examples/Tests/collision/PICMI_inputs_2d.py b/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py similarity index 97% rename from Examples/Tests/collision/PICMI_inputs_2d.py rename to Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py index 99e217b0afc..cbbd6959dab 100755 --- a/Examples/Tests/collision/PICMI_inputs_2d.py +++ b/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py @@ -110,7 +110,7 @@ name='diag1', period=10, write_dir='.', - warpx_file_prefix='Python_collisionXZ_plt' + warpx_file_prefix='collision_xz_picmi_plt' ) field_diag = picmi.FieldDiagnostic( name='diag1', @@ -118,7 +118,7 @@ period=10, data_list=[], write_dir='.', - warpx_file_prefix='Python_collisionXZ_plt' + warpx_file_prefix='collision_xz_picmi_plt' ) ################################# diff --git a/Examples/Tests/collision/inputs_3d_test_collisionISO b/Examples/Tests/collision/inputs_3d_test_collision_iso similarity index 100% rename from Examples/Tests/collision/inputs_3d_test_collisionISO rename to Examples/Tests/collision/inputs_3d_test_collision_iso diff --git a/Examples/Tests/collision/inputs_3d_test_collisionXYZ b/Examples/Tests/collision/inputs_3d_test_collision_xyz similarity index 100% rename from Examples/Tests/collision/inputs_3d_test_collisionXYZ rename to Examples/Tests/collision/inputs_3d_test_collision_xyz diff --git a/Examples/Tests/collision/inputs_rz_test_collisionRZ b/Examples/Tests/collision/inputs_rz_test_collision_rz similarity index 100% rename from Examples/Tests/collision/inputs_rz_test_collisionRZ rename to Examples/Tests/collision/inputs_rz_test_collision_rz diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt new file mode 100644 index 00000000000..ef72f9e1407 --- /dev/null +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# divb_cleaning_3d ############################################################ +# +add_warpx_test( + divb_cleaning_3d # name + 3 # dims + ON # mpi + Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d # inputs + Examples/Tests/divb_cleaning/analysis.py # analysis + diags/diag1000400 # output +) diff --git a/Examples/Tests/divb_cleaning/analysis.py b/Examples/Tests/divb_cleaning/analysis.py index a3523218ca6..ab588e034e2 100755 --- a/Examples/Tests/divb_cleaning/analysis.py +++ b/Examples/Tests/divb_cleaning/analysis.py @@ -24,8 +24,8 @@ fn = sys.argv[1] # Load yt data -ds_old = yt.load('divb_cleaning_3d_plt000398') -ds_mid = yt.load('divb_cleaning_3d_plt000399') +ds_old = yt.load('diags/diag1000398') +ds_mid = yt.load('diags/diag1000399') ds_new = yt.load(fn) # this is the last plotfile ad_old = ds_old.covering_grid(level = 0, left_edge = ds_old.domain_left_edge, dims = ds_old.domain_dimensions) diff --git a/Examples/Tests/divb_cleaning/inputs_3d b/Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d similarity index 100% rename from Examples/Tests/divb_cleaning/inputs_3d rename to Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt new file mode 100644 index 00000000000..ed4b7ac1938 --- /dev/null +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# dive_cleaning_2d ############################################################ +# +add_warpx_test( + dive_cleaning_2d # name + 2 # dims + ON # mpi + Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d # inputs + Examples/Tests/dive_cleaning/analysis.py # analysis + diags/diag1000128 # output +) + +# dive_cleaning_3d ############################################################ +# +add_warpx_test( + dive_cleaning_3d # name + 3 # dims + ON # mpi + Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d # inputs + Examples/Tests/dive_cleaning/analysis.py # analysis + diags/diag1000128 # output +) diff --git a/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d b/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d new file mode 100644 index 00000000000..a02b4f1d2cd --- /dev/null +++ b/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +geometry.dims = 2 diff --git a/Examples/Tests/dive_cleaning/inputs_3d b/Examples/Tests/dive_cleaning/inputs_3d_base similarity index 97% rename from Examples/Tests/dive_cleaning/inputs_3d rename to Examples/Tests/dive_cleaning/inputs_3d_base index c3f83ddbdd9..c7fc0616d30 100644 --- a/Examples/Tests/dive_cleaning/inputs_3d +++ b/Examples/Tests/dive_cleaning/inputs_3d_base @@ -3,7 +3,6 @@ amr.n_cell = 64 64 64 amr.max_grid_size = 32 amr.max_level = 0 -geometry.dims = 3 geometry.prob_lo = -50.e-6 -50.e-6 -50.e-6 geometry.prob_hi = 50.e-6 50.e-6 50.e-6 diff --git a/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d b/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d new file mode 100644 index 00000000000..7e1209ababb --- /dev/null +++ b/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +geometry.dims = 3 diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt new file mode 100644 index 00000000000..88911247eac --- /dev/null +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# dirichlet_bc ################################################################ +# +add_warpx_test( + dirichlet_bc # name + 2 # dims + ON # mpi + Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc # inputs + Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis + diags/diag1000100 # output +) + +# dirichlet_bc_picmi ########################################################## +# +add_warpx_test( + dirichlet_bc_picmi # name + 2 # dims + ON # mpi + Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py # inputs + Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis + diags/diag1000100 # output +) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc similarity index 100% rename from Examples/Tests/electrostatic_dirichlet_bc/inputs_2d rename to Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc diff --git a/Examples/Tests/electrostatic_dirichlet_bc/PICMI_inputs_2d.py b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py similarity index 100% rename from Examples/Tests/electrostatic_dirichlet_bc/PICMI_inputs_2d.py rename to Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt new file mode 100644 index 00000000000..4d6c8d1cec8 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -0,0 +1,57 @@ +# Add tests (alphabetical order) ############################################## +# + +# electrostatic_sphere ######################################################## +# +add_warpx_test( + electrostatic_sphere # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere # inputs + Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output +) + +# electrostatic_sphere_lab_frame ############################################## +# +add_warpx_test( + electrostatic_sphere_lab_frame # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame # inputs + Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output +) + +# electrostatic_sphere_lab_frame_MR_emass_10 ################################## +# +add_warpx_test( + electrostatic_sphere_lab_frame_MR_emass_10 # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 # inputs + Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + diags/diag1000002 # output +) + +# electrostatic_sphere_rel_nodal ############################################## +# +add_warpx_test( + electrostatic_sphere_rel_nodal # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal # inputs + Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output +) + +# electrostatic_sphere_rz ##################################################### +# +add_warpx_test( + electrostatic_sphere_rz # name + RZ # dims + ON # mpi + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rz # inputs + Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output +) diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d b/Examples/Tests/electrostatic_sphere/inputs_3d_base similarity index 100% rename from Examples/Tests/electrostatic_sphere/inputs_3d rename to Examples/Tests/electrostatic_sphere/inputs_3d_base diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere new file mode 100644 index 00000000000..7743ddf9b77 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame new file mode 100644 index 00000000000..61d0c42cd25 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +diag2.electron.variables = x y z ux uy uz w phi +warpx.do_electrostatic = labframe diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 new file mode 100644 index 00000000000..27a9dab24cf --- /dev/null +++ b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 @@ -0,0 +1,13 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +amr.max_level = 1 +amr.ref_ratio_vect = 2 2 2 +diag2.electron.variables = x y z ux uy uz w +electron.mass = 10 +max_step = 2 +warpx.abort_on_warning_threshold = medium +warpx.do_electrostatic = labframe +warpx.fine_tag_hi = 0.5 0.5 0.5 +warpx.fine_tag_lo = -0.5 -0.5 -0.5 diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal new file mode 100644 index 00000000000..49cfedbea05 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +warpx.abort_on_warning_threshold = medium +warpx.grid_type = collocated diff --git a/Examples/Tests/electrostatic_sphere/inputs_rz b/Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz similarity index 96% rename from Examples/Tests/electrostatic_sphere/inputs_rz rename to Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz index 2b6151e6d8c..a1c71c58fc3 100644 --- a/Examples/Tests/electrostatic_sphere/inputs_rz +++ b/Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz @@ -11,6 +11,7 @@ boundary.field_hi = pec pec warpx.const_dt = 1e-6 warpx.do_electrostatic = labframe warpx.use_filter = 0 +warpx.abort_on_warning_threshold = medium particles.species_names = electron diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt new file mode 100644 index 00000000000..b9875ea4208 --- /dev/null +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# energy_conserving_thermal_plasma ############################################ +# +add_warpx_test( + energy_conserving_thermal_plasma # name + 2 # dims + ON # mpi + Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma # inputs + Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis + diags/diag1000500 # output +) diff --git a/Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_electrostatic b/Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma similarity index 100% rename from Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_electrostatic rename to Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index bf4f0a595fb..c5338d971f6 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -53,6 +53,19 @@ if(WarpX_FFT) ) endif() +# comoving_2d_psatd_hybrid #################################################### +# +if(WarpX_FFT) + add_warpx_test( + comoving_2d_psatd_hybrid # name + 2 # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000400 # output + ) +endif() + # galilean_2d_psatd ########################################################### # if(WarpX_FFT) diff --git a/Examples/Tests/comoving/inputs_2d_hybrid b/Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid similarity index 97% rename from Examples/Tests/comoving/inputs_2d_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid index 393e18d2077..32b155cf0b6 100644 --- a/Examples/Tests/comoving/inputs_2d_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid @@ -23,6 +23,7 @@ algo.particle_pusher = vay algo.particle_shape = 3 psatd.use_default_v_comoving = 1 +psatd.current_correction = 0 warpx.cfl = 1. @@ -40,6 +41,7 @@ warpx.use_filter = 1 warpx.serialize_initial_conditions = 1 warpx.verbose = 1 +warpx.abort_on_warning_threshold = medium particles.species_names = electrons ions beam particles.use_fdtd_nci_corr = 0 diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt new file mode 100644 index 00000000000..cb070d18379 --- /dev/null +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -0,0 +1,68 @@ +# Add tests (alphabetical order) ############################################## +# + +# Deuterium_Deuterium_Fusion_3D ############################################### +# +add_warpx_test( + Deuterium_Deuterium_Fusion_3D # name + 3 # dims + ON # mpi + Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + diags/diag1000001 # output +) + +# Deuterium_Deuterium_Fusion_3D_intraspecies ################################## +# +add_warpx_test( + Deuterium_Deuterium_Fusion_3D_intraspecies # name + 3 # dims + OFF # mpi + Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies # inputs + Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis + diags/diag1000010 # output +) + +# Deuterium_Tritium_Fusion_3D ################################################# +# +add_warpx_test( + Deuterium_Tritium_Fusion_3D # name + 3 # dims + ON # mpi + Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + diags/diag1000001 # output +) + +# Deuterium_Tritium_Fusion_RZ ################################################# +# +add_warpx_test( + Deuterium_Tritium_Fusion_RZ # name + RZ # dims + ON # mpi + Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ # inputs + Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + diags/diag1000001 # output +) + +# Proton_Boron_Fusion_2D ###################################################### +# +add_warpx_test( + Proton_Boron_Fusion_2D # name + 2 # dims + ON # mpi + Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D # inputs + Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis + diags/diag1000001 # output +) + +# Proton_Boron_Fusion_3D ###################################################### +# +add_warpx_test( + Proton_Boron_Fusion_3D # name + 3 # dims + ON # mpi + Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/nuclear_fusion/inputs_proton_boron_2d b/Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_proton_boron_2d rename to Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D diff --git a/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d b/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d rename to Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D diff --git a/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies b/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies rename to Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies diff --git a/Examples/Tests/nuclear_fusion/inputs_deuterium_tritium_3d b/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_deuterium_tritium_3d rename to Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D diff --git a/Examples/Tests/nuclear_fusion/inputs_proton_boron_3d b/Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_proton_boron_3d rename to Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D diff --git a/Examples/Tests/nuclear_fusion/inputs_deuterium_tritium_rz b/Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_deuterium_tritium_rz rename to Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ diff --git a/Regression/Checksum/benchmarks_json/collisionISO.json b/Regression/Checksum/benchmarks_json/collision_iso.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collisionISO.json rename to Regression/Checksum/benchmarks_json/collision_iso.json diff --git a/Regression/Checksum/benchmarks_json/collisionRZ.json b/Regression/Checksum/benchmarks_json/collision_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collisionRZ.json rename to Regression/Checksum/benchmarks_json/collision_rz.json diff --git a/Regression/Checksum/benchmarks_json/collisionXYZ.json b/Regression/Checksum/benchmarks_json/collision_xyz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collisionXYZ.json rename to Regression/Checksum/benchmarks_json/collision_xyz.json diff --git a/Regression/Checksum/benchmarks_json/collisionXZ.json b/Regression/Checksum/benchmarks_json/collision_xz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collisionXZ.json rename to Regression/Checksum/benchmarks_json/collision_xz.json diff --git a/Regression/Checksum/benchmarks_json/collisionZ.json b/Regression/Checksum/benchmarks_json/collision_z.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collisionZ.json rename to Regression/Checksum/benchmarks_json/collision_z.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphere.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphere.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereLabFrame.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereLabFrame.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereLabFrame_MR_emass_10.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_MR_emass_10.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereLabFrame_MR_emass_10.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_MR_emass_10.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereRelNodal.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_rel_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereRelNodal.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_rel_nodal.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereRZ.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereRZ.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_rz.json diff --git a/Regression/Checksum/benchmarks_json/EnergyConservingThermalPlasma.json b/Regression/Checksum/benchmarks_json/energy_conserving_thermal_plasma.json similarity index 100% rename from Regression/Checksum/benchmarks_json/EnergyConservingThermalPlasma.json rename to Regression/Checksum/benchmarks_json/energy_conserving_thermal_plasma.json diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_BTD.json b/Regression/Checksum/benchmarks_json/laser_acceleration_btd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration_BTD.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_btd.json From 427643a9f6f9787748c8c2e0055743b157716f0b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 9 Aug 2024 08:59:08 -0700 Subject: [PATCH 065/167] Fix broken tests --- Examples/Tests/electrostatic_sphere/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 4d6c8d1cec8..3927842d325 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -51,7 +51,7 @@ add_warpx_test( electrostatic_sphere_rz # name RZ # dims ON # mpi - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rz # inputs + Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output ) From 0a4cad1d29edcd0516f8d78d4698d12ae0b3973b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 9 Aug 2024 09:28:33 -0700 Subject: [PATCH 066/167] Add more tests --- Examples/Tests/CMakeLists.txt | 5 ++ Examples/Tests/flux_injection/CMakeLists.txt | 24 ++++++++++ ...ts_3d => inputs_3d_test_flux_injection_3d} | 0 ...ts_rz => inputs_rz_test_flux_injection_rz} | 0 Examples/Tests/implicit/CMakeLists.txt | 46 +++++++++++++++++++ .../{Implicit => implicit}/analysis_1d.py | 5 +- .../analysis_vandb_jfnk_2d.py | 0 .../inputs_1d_test_semi_implicit_picard_1d} | 1 + .../inputs_1d_test_theta_implicit_picard_1d} | 1 + ...puts_2d_test_theta_implicit_jfnk_vandb_2d} | 1 + ...est_theta_implicit_jfnk_vandb_2d_picmi.py} | 8 +--- .../Tests/initial_distribution/CMakeLists.txt | 13 ++++++ ...ts => inputs_3d_test_initial_distribution} | 0 Examples/Tests/ion_stopping/CMakeLists.txt | 13 ++++++ ...{inputs_3d => inputs_3d_test_ion_stopping} | 1 + Examples/Tests/ionization/CMakeLists.txt | 35 ++++++++++++++ ..._bf_rt => inputs_2d_test_ionization_boost} | 0 ...ts_2d_rt => inputs_2d_test_ionization_lab} | 0 ....py => inputs_2d_test_ionization_picmi.py} | 0 Examples/Tests/langmuir/CMakeLists.txt | 27 +++++++++-- ...inputs_2d_test_Langmuir_multi_2d_picmi.py} | 4 +- ...inputs_3d_test_Langmuir_multi_3d_picmi.py} | 4 +- ...inputs_rz_test_Langmuir_multi_rz_picmi.py} | 0 ...r_2d.json => Langmuir_multi_2d_picmi.json} | 0 ...muir.json => Langmuir_multi_3d_picmi.json} | 0 ...mode.json => Langmuir_multi_rz_picmi.json} | 0 ...njection3D.json => flux_injection_3d.json} | 0 ...xInjection.json => flux_injection_rz.json} | 0 ..._ionization.json => ionization_picmi.json} | 0 ...d_1d.json => semi_implicit_picard_1d.json} | 0 ...json => theta_implicit_jfnk_vandb_2d.json} | 0 ...> theta_implicit_jfnk_vandb_2d_picmi.json} | 0 ..._1d.json => theta_implicit_picard_1d.json} | 0 33 files changed, 171 insertions(+), 17 deletions(-) create mode 100644 Examples/Tests/flux_injection/CMakeLists.txt rename Examples/Tests/flux_injection/{inputs_3d => inputs_3d_test_flux_injection_3d} (100%) rename Examples/Tests/flux_injection/{inputs_rz => inputs_rz_test_flux_injection_rz} (100%) create mode 100644 Examples/Tests/implicit/CMakeLists.txt rename Examples/Tests/{Implicit => implicit}/analysis_1d.py (88%) rename Examples/Tests/{Implicit => implicit}/analysis_vandb_jfnk_2d.py (100%) rename Examples/Tests/{Implicit/inputs_1d_semiimplicit => implicit/inputs_1d_test_semi_implicit_picard_1d} (98%) rename Examples/Tests/{Implicit/inputs_1d => implicit/inputs_1d_test_theta_implicit_picard_1d} (98%) rename Examples/Tests/{Implicit/inputs_vandb_jfnk_2d => implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d} (98%) rename Examples/Tests/{Implicit/PICMI_inputs_vandb_jfnk_2d.py => implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py} (93%) create mode 100644 Examples/Tests/initial_distribution/CMakeLists.txt rename Examples/Tests/initial_distribution/{inputs => inputs_3d_test_initial_distribution} (100%) create mode 100644 Examples/Tests/ion_stopping/CMakeLists.txt rename Examples/Tests/ion_stopping/{inputs_3d => inputs_3d_test_ion_stopping} (99%) create mode 100644 Examples/Tests/ionization/CMakeLists.txt rename Examples/Tests/ionization/{inputs_2d_bf_rt => inputs_2d_test_ionization_boost} (100%) rename Examples/Tests/ionization/{inputs_2d_rt => inputs_2d_test_ionization_lab} (100%) rename Examples/Tests/ionization/{PICMI_inputs_2d.py => inputs_2d_test_ionization_picmi.py} (100%) rename Examples/Tests/langmuir/{PICMI_inputs_2d.py => inputs_2d_test_Langmuir_multi_2d_picmi.py} (93%) rename Examples/Tests/langmuir/{PICMI_inputs_3d.py => inputs_3d_test_Langmuir_multi_3d_picmi.py} (93%) rename Examples/Tests/langmuir/{PICMI_inputs_rz.py => inputs_rz_test_Langmuir_multi_rz_picmi.py} (100%) rename Regression/Checksum/benchmarks_json/{Python_Langmuir_2d.json => Langmuir_multi_2d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_Langmuir.json => Langmuir_multi_3d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_Langmuir_rz_multimode.json => Langmuir_multi_rz_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{FluxInjection3D.json => flux_injection_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{FluxInjection.json => flux_injection_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ionization.json => ionization_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{SemiImplicitPicard_1d.json => semi_implicit_picard_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{ThetaImplicitJFNK_VandB_2d.json => theta_implicit_jfnk_vandb_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{ThetaImplicitJFNK_VandB_2d_PICMI.json => theta_implicit_jfnk_vandb_2d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{ThetaImplicitPicard_1d.json => theta_implicit_picard_1d.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 1fa4e7025a9..87756a4879d 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -12,7 +12,12 @@ add_subdirectory(dive_cleaning) add_subdirectory(electrostatic_dirichlet_bc) add_subdirectory(electrostatic_sphere) add_subdirectory(energy_conserving_thermal_plasma) +add_subdirectory(flux_injection) add_subdirectory(gaussian_beam) +add_subdirectory(implicit) +add_subdirectory(initial_distribution) +add_subdirectory(ionization) +add_subdirectory(ion_stopping) add_subdirectory(langmuir) add_subdirectory(nuclear_fusion) add_subdirectory(nci_psatd_stability) diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt new file mode 100644 index 00000000000..176d54ab909 --- /dev/null +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# flux_injection_3d ########################################################### +# +add_warpx_test( + flux_injection_3d # name + 3 # dims + ON # mpi + Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d # inputs + Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis + diags/diag1000002 # output +) + +# flux_injection_rz ########################################################### +# +add_warpx_test( + flux_injection_rz # name + RZ # dims + ON # mpi + Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz # inputs + Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis + diags/diag1000120 # output +) diff --git a/Examples/Tests/flux_injection/inputs_3d b/Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d similarity index 100% rename from Examples/Tests/flux_injection/inputs_3d rename to Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d diff --git a/Examples/Tests/flux_injection/inputs_rz b/Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz similarity index 100% rename from Examples/Tests/flux_injection/inputs_rz rename to Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt new file mode 100644 index 00000000000..ac10297246f --- /dev/null +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -0,0 +1,46 @@ +# Add tests (alphabetical order) ############################################## +# + +# semi_implicit_picard_1d ##################################################### +# +add_warpx_test( + semi_implicit_picard_1d # name + 1 # dims + ON # mpi + Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d # inputs + Examples/Tests/implicit/analysis_1d.py # analysis + diags/diag1000100 # output +) + +# theta_implicit_jfnk_vandb_2d ################################################ +# +add_warpx_test( + theta_implicit_jfnk_vandb_2d # name + 2 # dims + ON # mpi + Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d # inputs + Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis + diags/diag1000020 # output +) + +# theta_implicit_jfnk_vandb_2d_picmi ########################################## +# +add_warpx_test( + theta_implicit_jfnk_vandb_2d_picmi # name + 2 # dims + ON # mpi + Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py # inputs + Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis + diags/diag1000020 # output +) + +# theta_implicit_picard_1d #################################################### +# +add_warpx_test( + theta_implicit_picard_1d # name + 1 # dims + ON # mpi + Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d # inputs + Examples/Tests/implicit/analysis_1d.py # analysis + diags/diag1000100 # output +) diff --git a/Examples/Tests/Implicit/analysis_1d.py b/Examples/Tests/implicit/analysis_1d.py similarity index 88% rename from Examples/Tests/Implicit/analysis_1d.py rename to Examples/Tests/implicit/analysis_1d.py index 0e20b925df5..ca4a7deee83 100755 --- a/Examples/Tests/Implicit/analysis_1d.py +++ b/Examples/Tests/implicit/analysis_1d.py @@ -29,9 +29,10 @@ delta_E = (total_energy - total_energy[0])/total_energy[0] max_delta_E = np.abs(delta_E).max() -if re.match('SemiImplicitPicard_1d', fn): +test_name = os.path.split(os.getcwd())[1] +if re.match('semi_implicit_picard_1d', test_name): tolerance_rel = 2.5e-5 -elif re.match('ThetaImplicitPicard_1d', fn): +elif re.match('theta_implicit_picard_1d', test_name): # This case should have near machine precision conservation of energy tolerance_rel = 1.e-14 diff --git a/Examples/Tests/Implicit/analysis_vandb_jfnk_2d.py b/Examples/Tests/implicit/analysis_vandb_jfnk_2d.py similarity index 100% rename from Examples/Tests/Implicit/analysis_vandb_jfnk_2d.py rename to Examples/Tests/implicit/analysis_vandb_jfnk_2d.py diff --git a/Examples/Tests/Implicit/inputs_1d_semiimplicit b/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d similarity index 98% rename from Examples/Tests/Implicit/inputs_1d_semiimplicit rename to Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d index 07460e08be8..ad339287df2 100644 --- a/Examples/Tests/Implicit/inputs_1d_semiimplicit +++ b/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d @@ -31,6 +31,7 @@ boundary.particle_hi = periodic ############ NUMERICS ########### ################################# +warpx.abort_on_warning_threshold = high warpx.verbose = 1 warpx.const_dt = dt algo.evolve_scheme = semi_implicit_em diff --git a/Examples/Tests/Implicit/inputs_1d b/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d similarity index 98% rename from Examples/Tests/Implicit/inputs_1d rename to Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d index 3e57689b723..211495e1f1e 100644 --- a/Examples/Tests/Implicit/inputs_1d +++ b/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d @@ -31,6 +31,7 @@ boundary.particle_hi = periodic ############ NUMERICS ########### ################################# +warpx.abort_on_warning_threshold = high warpx.verbose = 1 warpx.const_dt = dt algo.evolve_scheme = theta_implicit_em diff --git a/Examples/Tests/Implicit/inputs_vandb_jfnk_2d b/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d similarity index 98% rename from Examples/Tests/Implicit/inputs_vandb_jfnk_2d rename to Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d index 393a9d90330..0cdf2ebe40d 100644 --- a/Examples/Tests/Implicit/inputs_vandb_jfnk_2d +++ b/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d @@ -31,6 +31,7 @@ boundary.field_hi = periodic periodic ################################# ############ NUMERICS ########### ################################# +warpx.abort_on_warning_threshold = high warpx.serialize_initial_conditions = 1 warpx.verbose = 1 warpx.const_dt = dt diff --git a/Examples/Tests/Implicit/PICMI_inputs_vandb_jfnk_2d.py b/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py similarity index 93% rename from Examples/Tests/Implicit/PICMI_inputs_vandb_jfnk_2d.py rename to Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py index 2f919124e13..a091e1a5e95 100755 --- a/Examples/Tests/Implicit/PICMI_inputs_vandb_jfnk_2d.py +++ b/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py @@ -95,16 +95,12 @@ field_diag1 = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = diagnostic_intervals, - data_list = ['Ex', 'Ey', 'Ez', 'Bx', 'By', 'Bz', 'Jx', 'Jy', 'Jz', 'rho', 'divE'], - write_dir = '.', - warpx_file_prefix = 'ThetaImplicitJFNK_VandB_2d_PICMI_plt') + data_list = ['Ex', 'Ey', 'Ez', 'Bx', 'By', 'Bz', 'Jx', 'Jy', 'Jz', 'rho', 'divE']) part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_intervals, species = [electrons, protons], - data_list = ['weighting', 'position', 'momentum'], - write_dir = '.', - warpx_file_prefix = 'ThetaImplicitJFNK_VandB_2d_PICMI_plt') + data_list = ['weighting', 'position', 'momentum']) particle_energy_diag = picmi.ReducedDiagnostic(diag_type = 'ParticleEnergy', name = 'particle_energy', diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt new file mode 100644 index 00000000000..3ad44ace0ca --- /dev/null +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# initial_distribution ######################################################## +# +add_warpx_test( + initial_distribution # name + 3 # dims + OFF # mpi + Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution # inputs + Examples/Tests/initial_distribution/analysis_distribution.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/initial_distribution/inputs b/Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution similarity index 100% rename from Examples/Tests/initial_distribution/inputs rename to Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt new file mode 100644 index 00000000000..d8bbc826d37 --- /dev/null +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# ion_stopping ################################################################ +# +add_warpx_test( + ion_stopping # name + 3 # dims + OFF # mpi + Examples/Tests/ion_stopping/inputs_2d_test_ion_stopping # inputs + Examples/Tests/ion_stopping/analysis_ion_stopping.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/ion_stopping/inputs_3d b/Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping similarity index 99% rename from Examples/Tests/ion_stopping/inputs_3d rename to Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping index 291e1ca0a9e..93b59bbde4a 100644 --- a/Examples/Tests/ion_stopping/inputs_3d +++ b/Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping @@ -14,6 +14,7 @@ boundary.field_hi = periodic periodic periodic boundary.particle_lo = periodic periodic periodic boundary.particle_hi = periodic periodic periodic algo.particle_shape = 1 +warpx.cfl = 0.7 particles.species_names = ions1 ions2 ions3 ions4 diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt new file mode 100644 index 00000000000..302bdf1fb95 --- /dev/null +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# ionization_boost ############################################################ +# +add_warpx_test( + ionization_boost # name + 2 # dims + ON # mpi + Examples/Tests/ionization/inputs_2d_test_ionization_boost # inputs + Examples/Tests/ionization/analysis_ionization.py # analysis + diags/diag1000420 # output +) + +# ionization_lab ############################################################## +# +add_warpx_test( + ionization_lab # name + 2 # dims + ON # mpi + Examples/Tests/ionization/inputs_2d_test_ionization_lab # inputs + Examples/Tests/ionization/analysis_ionization.py # analysis + diags/diag1001600 # output +) + +# ionization_picmi ############################################################## +# +add_warpx_test( + ionization_picmi # name + 2 # dims + ON # mpi + Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py # inputs + Examples/Tests/ionization/analysis_ionization.py # analysis + diags/diag1001600 # output +) diff --git a/Examples/Tests/ionization/inputs_2d_bf_rt b/Examples/Tests/ionization/inputs_2d_test_ionization_boost similarity index 100% rename from Examples/Tests/ionization/inputs_2d_bf_rt rename to Examples/Tests/ionization/inputs_2d_test_ionization_boost diff --git a/Examples/Tests/ionization/inputs_2d_rt b/Examples/Tests/ionization/inputs_2d_test_ionization_lab similarity index 100% rename from Examples/Tests/ionization/inputs_2d_rt rename to Examples/Tests/ionization/inputs_2d_test_ionization_lab diff --git a/Examples/Tests/ionization/PICMI_inputs_2d.py b/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py similarity index 100% rename from Examples/Tests/ionization/PICMI_inputs_2d.py rename to Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 2208d99f8eb..d764755ee81 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -58,6 +58,16 @@ add_warpx_test( diags/diag1000080 # output ) +# Langmuir_multi_2d_picmi ##################################################### +# +add_warpx_test( + Langmuir_multi_2d_picmi # name + 2 # dims + ON # mpi + Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000040 # output +) # Langmuir_multi_2d_psatd ##################################################### # @@ -190,13 +200,24 @@ if(WarpX_FFT) ) endif() -# Python_Langmuir_rz_multimode ################################################ +# Langmuir_multi_3d_picmi ##################################################### +# +add_warpx_test( + Langmuir_multi_3d_picmi # name + 3 # dims + OFF # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000040 # output +) + +# Langmuir_multi_rz_picmi ##################################################### # add_warpx_test( - Python_Langmuir_rz_multimode # name + Langmuir_multi_rz_picmi # name RZ # dims ON # mpi - Examples/Tests/langmuir/PICMI_inputs_rz.py # inputs + Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) diff --git a/Examples/Tests/langmuir/PICMI_inputs_2d.py b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py similarity index 93% rename from Examples/Tests/langmuir/PICMI_inputs_2d.py rename to Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py index 4b9c3ac300f..1e8248e385c 100755 --- a/Examples/Tests/langmuir/PICMI_inputs_2d.py +++ b/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py @@ -65,9 +65,7 @@ field_diag1 = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = diagnostic_intervals, - data_list = ['Ex', 'Jx'], - write_dir = '.', - warpx_file_prefix = 'Python_Langmuir_2d_plt') + data_list = ['Ex', 'Jx']) part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_intervals, diff --git a/Examples/Tests/langmuir/PICMI_inputs_3d.py b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py similarity index 93% rename from Examples/Tests/langmuir/PICMI_inputs_3d.py rename to Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py index 180180f5f45..18efcdaed34 100755 --- a/Examples/Tests/langmuir/PICMI_inputs_3d.py +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py @@ -67,9 +67,7 @@ field_diag1 = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = diagnostic_interval, - data_list = ['Ex', 'Jx'], - write_dir = '.', - warpx_file_prefix = 'Python_Langmuir_plt') + data_list = ['Ex', 'Jx']) part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_interval, diff --git a/Examples/Tests/langmuir/PICMI_inputs_rz.py b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py similarity index 100% rename from Examples/Tests/langmuir/PICMI_inputs_rz.py rename to Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py diff --git a/Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_Langmuir_2d.json rename to Regression/Checksum/benchmarks_json/Langmuir_multi_2d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_Langmuir.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_3d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_Langmuir.json rename to Regression/Checksum/benchmarks_json/Langmuir_multi_3d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_Langmuir_rz_multimode.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_rz_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_Langmuir_rz_multimode.json rename to Regression/Checksum/benchmarks_json/Langmuir_multi_rz_picmi.json diff --git a/Regression/Checksum/benchmarks_json/FluxInjection3D.json b/Regression/Checksum/benchmarks_json/flux_injection_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/FluxInjection3D.json rename to Regression/Checksum/benchmarks_json/flux_injection_3d.json diff --git a/Regression/Checksum/benchmarks_json/FluxInjection.json b/Regression/Checksum/benchmarks_json/flux_injection_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/FluxInjection.json rename to Regression/Checksum/benchmarks_json/flux_injection_rz.json diff --git a/Regression/Checksum/benchmarks_json/Python_ionization.json b/Regression/Checksum/benchmarks_json/ionization_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ionization.json rename to Regression/Checksum/benchmarks_json/ionization_picmi.json diff --git a/Regression/Checksum/benchmarks_json/SemiImplicitPicard_1d.json b/Regression/Checksum/benchmarks_json/semi_implicit_picard_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/SemiImplicitPicard_1d.json rename to Regression/Checksum/benchmarks_json/semi_implicit_picard_1d.json diff --git a/Regression/Checksum/benchmarks_json/ThetaImplicitJFNK_VandB_2d.json b/Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ThetaImplicitJFNK_VandB_2d.json rename to Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d.json diff --git a/Regression/Checksum/benchmarks_json/ThetaImplicitJFNK_VandB_2d_PICMI.json b/Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ThetaImplicitJFNK_VandB_2d_PICMI.json rename to Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/ThetaImplicitPicard_1d.json b/Regression/Checksum/benchmarks_json/theta_implicit_picard_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ThetaImplicitPicard_1d.json rename to Regression/Checksum/benchmarks_json/theta_implicit_picard_1d.json From 8eeaf67100f8c7621b94bf7b161d1bda9b214157 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 9 Aug 2024 14:43:13 -0700 Subject: [PATCH 067/167] Fix broken tests --- Examples/CMakeLists.txt | 1 + Examples/Tests/ion_stopping/CMakeLists.txt | 2 +- Examples/Tests/ion_stopping/analysis_ion_stopping.py | 2 +- .../Tests/ionization/inputs_2d_test_ionization_picmi.py | 8 ++------ 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 6a4c49f50d1..fd857f70b8b 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -140,6 +140,7 @@ function(add_warpx_test set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/Parser") + set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Tools/PostProcessing") set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") endif() diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index d8bbc826d37..e65b080dd00 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -7,7 +7,7 @@ add_warpx_test( ion_stopping # name 3 # dims OFF # mpi - Examples/Tests/ion_stopping/inputs_2d_test_ion_stopping # inputs + Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping # inputs Examples/Tests/ion_stopping/analysis_ion_stopping.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/ion_stopping/analysis_ion_stopping.py b/Examples/Tests/ion_stopping/analysis_ion_stopping.py index d7774c14d6b..e47a00873f6 100755 --- a/Examples/Tests/ion_stopping/analysis_ion_stopping.py +++ b/Examples/Tests/ion_stopping/analysis_ion_stopping.py @@ -74,7 +74,7 @@ def stopping_from_ions(dt, ni, Ti, mi, Zi, Zb, ion_mass, ion_energy): return ion_energy # Fetch background parameters and initial particle data -ds0 = yt.load(f'{prefix}{len(last_it)*"0"}') +ds0 = yt.load('diags/diag1000000') ad0 = ds0.all_data() Zb = 1. # Ion charge state diff --git a/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py b/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py index 802bf5435ac..71a1b74f500 100644 --- a/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py +++ b/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py @@ -90,16 +90,12 @@ name = 'diag1', period = 10000, species = [electrons, ions], - data_list = ['ux', 'uy', 'uz', 'x', 'z', 'weighting', 'orig_z'], - write_dir = '.', - warpx_file_prefix = 'Python_ionization_plt') + data_list = ['ux', 'uy', 'uz', 'x', 'z', 'weighting', 'orig_z']) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 10000, - data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], - write_dir = '.', - warpx_file_prefix = 'Python_ionization_plt') + data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz']) # Set up simulation sim = picmi.Simulation( From ffc8d4b041dcf5dc9abbbe67dd9c95cce71fe477 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 9 Aug 2024 16:10:10 -0700 Subject: [PATCH 068/167] Add more tests --- Examples/Tests/CMakeLists.txt | 4 + Examples/Tests/langmuir/CMakeLists.txt | 219 +++++++++++++++++- ...ts_1d => inputs_1d_test_Langmuir_multi_1d} | 3 + .../langmuir/{inputs_3d => inputs_3d_base} | 0 .../langmuir/inputs_3d_test_Langmuir_multi | 2 + .../inputs_3d_test_Langmuir_multi_nodal | 6 + ...=> inputs_3d_test_Langmuir_multi_picmi.py} | 0 .../inputs_3d_test_Langmuir_multi_psatd | 6 + ...d_test_Langmuir_multi_psatd_Vay_deposition | 8 + ..._Langmuir_multi_psatd_Vay_deposition_nodal | 9 + ...st_Langmuir_multi_psatd_current_correction | 10 + ...gmuir_multi_psatd_current_correction_nodal | 11 + ..._3d_test_Langmuir_multi_psatd_div_cleaning | 13 ++ ...t_Langmuir_multi_psatd_momentum_conserving | 7 + ...inputs_3d_test_Langmuir_multi_psatd_multiJ | 13 ++ ..._3d_test_Langmuir_multi_psatd_multiJ_nodal | 14 ++ .../inputs_3d_test_Langmuir_multi_psatd_nodal | 10 + .../langmuir/{inputs_rz => inputs_rz_base} | 0 .../langmuir/inputs_rz_test_Langmuir_multi_rz | 7 + .../inputs_rz_test_Langmuir_multi_rz_psatd | 15 ++ ...Langmuir_multi_rz_psatd_current_correction | 16 ++ ...uts_rz_test_Langmuir_multi_rz_psatd_multiJ | 22 ++ Examples/Tests/langmuir_fluids/CMakeLists.txt | 46 ++++ ...ts_1d => inputs_1d_test_Langmuir_fluid_1d} | 0 ...ts_2d => inputs_2d_test_Langmuir_fluid_2d} | 0 ...ts_3d => inputs_3d_test_Langmuir_fluid_3d} | 0 ...ts_rz => inputs_rz_test_Langmuir_fluid_rz} | 0 Examples/Tests/larmor/CMakeLists.txt | 13 ++ .../{inputs_2d_mr => inputs_2d_test_Larmor} | 2 +- Examples/Tests/laser_injection/CMakeLists.txt | 35 +++ .../{analysis_laser.py => analysis_3d.py} | 0 ...d_rt => inputs_1d_test_laser_injection_1d} | 0 ...d_rt => inputs_2d_test_laser_injection_2d} | 0 ...d_rt => inputs_3d_test_laser_injection_3d} | 0 .../laser_injection_from_file/CMakeLists.txt | 79 +++++++ ...1d_test_laser_injection_from_lasy_file_1d} | 0 ...t_laser_injection_from_lasy_file_1d_boost} | 0 ..._2d_test_laser_injection_from_binary_file} | 0 ...2d_test_laser_injection_from_lasy_file_2d} | 0 ...3d_test_laser_injection_from_lasy_file_3d} | 0 ...rz_test_laser_injection_from_lasy_file_rz} | 0 ...rz_test_laser_injection_from_rz_lasy_file} | 0 ...r_fluid_1D.json => Langmuir_fluid_1d.json} | 0 ...r_fluid_2D.json => Langmuir_fluid_2d.json} | 0 ...luid_multi.json => Langmuir_fluid_3d.json} | 0 ...r_fluid_RZ.json => Langmuir_fluid_rz.json} | 0 ...d_picmi.json => Langmuir_multi_picmi.json} | 0 ...ection_1d.json => laser_injection_1d.json} | 0 ...ection_2d.json => laser_injection_2d.json} | 0 ...Injection.json => laser_injection_3d.json} | 0 ... => laser_injection_from_binary_file.json} | 0 ...=> laser_injection_from_lasy_file_1d.json} | 0 ...er_injection_from_lasy_file_1d_boost.json} | 0 ...=> laser_injection_from_lasy_file_2d.json} | 0 ...=> laser_injection_from_lasy_file_3d.json} | 0 ...=> laser_injection_from_lasy_file_rz.json} | 0 ...=> laser_injection_from_rz_lasy_file.json} | 0 57 files changed, 566 insertions(+), 4 deletions(-) rename Examples/Tests/langmuir/{inputs_1d => inputs_1d_test_Langmuir_multi_1d} (95%) rename Examples/Tests/langmuir/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_3d_picmi.py => inputs_3d_test_Langmuir_multi_picmi.py} (100%) create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal create mode 100644 Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal rename Examples/Tests/langmuir/{inputs_rz => inputs_rz_base} (100%) create mode 100644 Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz create mode 100644 Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd create mode 100644 Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction create mode 100644 Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ create mode 100644 Examples/Tests/langmuir_fluids/CMakeLists.txt rename Examples/Tests/langmuir_fluids/{inputs_1d => inputs_1d_test_Langmuir_fluid_1d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_2d => inputs_2d_test_Langmuir_fluid_2d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_3d => inputs_3d_test_Langmuir_fluid_3d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_rz => inputs_rz_test_Langmuir_fluid_rz} (100%) create mode 100644 Examples/Tests/larmor/CMakeLists.txt rename Examples/Tests/larmor/{inputs_2d_mr => inputs_2d_test_Larmor} (99%) create mode 100644 Examples/Tests/laser_injection/CMakeLists.txt rename Examples/Tests/laser_injection/{analysis_laser.py => analysis_3d.py} (100%) rename Examples/Tests/laser_injection/{inputs_1d_rt => inputs_1d_test_laser_injection_1d} (100%) rename Examples/Tests/laser_injection/{inputs_2d_rt => inputs_2d_test_laser_injection_2d} (100%) rename Examples/Tests/laser_injection/{inputs_3d_rt => inputs_3d_test_laser_injection_3d} (100%) create mode 100644 Examples/Tests/laser_injection_from_file/CMakeLists.txt rename Examples/Tests/laser_injection_from_file/{inputs.1d_test => inputs_1d_test_laser_injection_from_lasy_file_1d} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.1d_boost_test => inputs_1d_test_laser_injection_from_lasy_file_1d_boost} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.2d_test_binary => inputs_2d_test_laser_injection_from_binary_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.2d_test => inputs_2d_test_laser_injection_from_lasy_file_2d} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.3d_test => inputs_3d_test_laser_injection_from_lasy_file_3d} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.RZ_test => inputs_rz_test_laser_injection_from_lasy_file_rz} (100%) rename Examples/Tests/laser_injection_from_file/{inputs.from_RZ_file_test => inputs_rz_test_laser_injection_from_rz_lasy_file} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_1D.json => Langmuir_fluid_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_2D.json => Langmuir_fluid_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_multi.json => Langmuir_fluid_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_RZ.json => Langmuir_fluid_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_3d_picmi.json => Langmuir_multi_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjection_1d.json => laser_injection_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjection_2d.json => laser_injection_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjection.json => laser_injection_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromBINARYFile.json => laser_injection_from_binary_file.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromLASYFile_1d.json => laser_injection_from_lasy_file_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromLASYFile_1d_boost.json => laser_injection_from_lasy_file_1d_boost.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromLASYFile_2d.json => laser_injection_from_lasy_file_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromLASYFile.json => laser_injection_from_lasy_file_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromLASYFile_RZ.json => laser_injection_from_lasy_file_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserInjectionFromRZLASYFile.json => laser_injection_from_rz_lasy_file.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 87756a4879d..0f7784aeac4 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -19,6 +19,10 @@ add_subdirectory(initial_distribution) add_subdirectory(ionization) add_subdirectory(ion_stopping) add_subdirectory(langmuir) +add_subdirectory(langmuir_fluid) +add_subdirectory(larmor) +add_subdirectory(laser_injection) +add_subdirectory(laser_injection_from_file) add_subdirectory(nuclear_fusion) add_subdirectory(nci_psatd_stability) add_subdirectory(single_particle) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index d764755ee81..7bfed7c336a 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -1,6 +1,28 @@ # Add tests (alphabetical order) ############################################## # +# Langmuir_multi ############################################################## +# +add_warpx_test( + Langmuir_multi # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output +) + +# Langmuir_multi_1d ########################################################### +# +add_warpx_test( + Langmuir_multi_1d # name + 1 # dims + ON # mpi + Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d # inputs + Examples/Tests/langmuir/analysis_1d.py # analysis + diags/diag1000080 # output +) + # Langmuir_multi_2d_MR ######################################################## # add_warpx_test( @@ -200,17 +222,169 @@ if(WarpX_FFT) ) endif() -# Langmuir_multi_3d_picmi ##################################################### +# Langmuir_multi_nodal ######################################################## +# +add_warpx_test( + Langmuir_multi_nodal # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output +) + +# Langmuir_multi_picmi ######################################################## # add_warpx_test( - Langmuir_multi_3d_picmi # name + Langmuir_multi_picmi # name 3 # dims OFF # mpi - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py # inputs + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) +# Langmuir_multi_psatd ######################################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_current_correction ##################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_current_correction # name + 3 # dims + OFF # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_current_correction_nodal ############################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_current_correction_nodal # name + 3 # dims + OFF # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_div_cleaning ########################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_div_cleaning # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_momentum_conserving #################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_momentum_conserving # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_multiJ ################################################# +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_multiJ # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_multiJ_nodal ########################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_multiJ_nodal # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_nodal ################################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_nodal # name + 3 # dims + ON # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_Vay_deposition ######################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_Vay_deposition # name + 3 # dims + OFF # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_psatd_Vay_deposition_nodal ################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_psatd_Vay_deposition_nodal # name + 3 # dims + OFF # mpi + Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output + ) +endif() + +# Langmuir_multi_rz ########################################################### +# +add_warpx_test( + Langmuir_multi_rz # name + RZ # dims + ON # mpi + Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz # inputs + Examples/Tests/langmuir/analysis_rz.py # analysis + diags/diag1000080 # output +) + # Langmuir_multi_rz_picmi ##################################################### # add_warpx_test( @@ -221,3 +395,42 @@ add_warpx_test( Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) + +# Langmuir_multi_rz_psatd ##################################################### +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_rz_psatd # name + RZ # dims + ON # mpi + Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd # inputs + Examples/Tests/langmuir/analysis_rz.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_rz_psatd_current_correction ################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_rz_psatd_correction # name + RZ # dims + OFF # mpi + Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction # inputs + Examples/Tests/langmuir/analysis_rz.py # analysis + diags/diag1000080 # output + ) +endif() + +# Langmuir_multi_rz_psatd_multiJ ############################################## +# +if(WarpX_FFT) + add_warpx_test( + Langmuir_multi_rz_psatd_multiJ # name + RZ # dims + ON # mpi + Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ # inputs + Examples/Tests/langmuir/analysis_rz.py # analysis + diags/diag1000080 # output + ) +endif() diff --git a/Examples/Tests/langmuir/inputs_1d b/Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d similarity index 95% rename from Examples/Tests/langmuir/inputs_1d rename to Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d index af1cf367553..e2fd1da4b94 100644 --- a/Examples/Tests/langmuir/inputs_1d +++ b/Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d @@ -27,6 +27,7 @@ warpx.verbose = 1 # Algorithms algo.field_gathering = energy-conserving +algo.current_deposition = esirkepov warpx.use_filter = 0 # Order of particle shape factors @@ -79,6 +80,8 @@ positrons.momentum_function_uz(x,y,z) = "-epsilon * k/kp * cos(k*x) * cos(k*y) * diagnostics.diags_names = diag1 openpmd diag1.intervals = 40 diag1.diag_type = Full +diag1.electrons.variables = z w ux uy uz +diag1.positrons.variables = z w ux uy uz openpmd.intervals = 40 openpmd.diag_type = Full diff --git a/Examples/Tests/langmuir/inputs_3d b/Examples/Tests/langmuir/inputs_3d_base similarity index 100% rename from Examples/Tests/langmuir/inputs_3d rename to Examples/Tests/langmuir/inputs_3d_base diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi new file mode 100644 index 00000000000..287576a9c7f --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal new file mode 100644 index 00000000000..15dd8645011 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_3d_picmi.py rename to Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd new file mode 100644 index 00000000000..01e3c64ebcb --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.maxwell_solver = psatd +warpx.cfl = 0.5773502691896258 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition new file mode 100644 index 00000000000..107089499c4 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = vay +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +warpx.cfl = 0.5773502691896258 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal new file mode 100644 index 00000000000..333a9b04266 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal @@ -0,0 +1,9 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = vay +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez jx jy jz part_per_cell rho divE +warpx.cfl = 0.5773502691896258 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction new file mode 100644 index 00000000000..ee1e3790c39 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction @@ -0,0 +1,10 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = esirkepov +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +warpx.cfl = 0.5773502691896258 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal new file mode 100644 index 00000000000..ff3438a3605 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal @@ -0,0 +1,11 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +warpx.cfl = 0.5773502691896258 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning new file mode 100644 index 00000000000..ceffd849608 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning @@ -0,0 +1,13 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +diag1.intervals = 0, 38:40:1 +diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz part_per_cell rho divE F +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.5773502691896258 +warpx.do_dive_cleaning = 1 +warpx.do_divb_cleaning = 1 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving new file mode 100644 index 00000000000..f98b8025429 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.field_gathering = momentum-conserving +algo.maxwell_solver = psatd +warpx.cfl = 0.5773502691896258 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ new file mode 100644 index 00000000000..fa113448b25 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ @@ -0,0 +1,13 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +warpx.cfl = 0.5773502691896258 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 2 +psatd.J_in_time = linear +psatd.solution_type = first-order +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal new file mode 100644 index 00000000000..f33de387170 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal @@ -0,0 +1,14 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +psatd.J_in_time = linear +psatd.solution_type = first-order +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.5773502691896258 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 2 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal new file mode 100644 index 00000000000..280ce13dbf1 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal @@ -0,0 +1,10 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +psatd.current_correction = 0 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.5773502691896258 +warpx.grid_type = collocated diff --git a/Examples/Tests/langmuir/inputs_rz b/Examples/Tests/langmuir/inputs_rz_base similarity index 100% rename from Examples/Tests/langmuir/inputs_rz rename to Examples/Tests/langmuir/inputs_rz_base diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz new file mode 100644 index 00000000000..0c3807e5895 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +diag1.dump_rz_modes = 0 +diag1.electrons.variables = x y z w ux uy uz +diag1.ions.variables = x y z w ux uy uz diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd new file mode 100644 index 00000000000..cbf6645574d --- /dev/null +++ b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd @@ -0,0 +1,15 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +diag1.dump_rz_modes = 0 +diag1.electrons.variables = x y z w ux uy uz +diag1.ions.variables = x y z w ux uy uz +electrons.random_theta = 0 +ions.random_theta = 0 +psatd.current_correction = 0 +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.do_dive_cleaning = 0 diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction new file mode 100644 index 00000000000..6c6fde1be99 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction @@ -0,0 +1,16 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +amr.max_grid_size = 128 +diag1.dump_rz_modes = 0 +diag1.electrons.variables = x y z w ux uy uz +diag1.fields_to_plot = jr jz Er Ez Bt rho divE +diag1.ions.variables = x y z w ux uy uz +electrons.random_theta = 0 +ions.random_theta = 0 +psatd.current_correction = 1 +psatd.periodic_single_box_fft = 1 +warpx.do_dive_cleaning = 0 diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ new file mode 100644 index 00000000000..a8bebdb1005 --- /dev/null +++ b/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ @@ -0,0 +1,22 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +algo.current_deposition = direct +algo.maxwell_solver = psatd +amr.max_grid_size = 32 +diag1.dump_rz_modes = 0 +diag1.electrons.variables = x y z w ux uy uz +diag1.ions.variables = x y z w ux uy uz +electrons.num_particles_per_cell_each_dim = 2 4 2 +electrons.random_theta = 0 +ions.num_particles_per_cell_each_dim = 2 4 2 +ions.random_theta = 0 +psatd.current_correction = 0 +psatd.update_with_rho = 1 +warpx.abort_on_warning_threshold = medium +warpx.do_dive_cleaning = 0 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 4 +warpx.n_rz_azimuthal_modes = 2 +warpx.use_filter = 1 diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt new file mode 100644 index 00000000000..12c10f992e2 --- /dev/null +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -0,0 +1,46 @@ +# Add tests (alphabetical order) ############################################## +# + +# Langmuir_fluid_1d ########################################################### +# +add_warpx_test( + Langmuir_fluid_1d # name + 1 # dims + ON # mpi + Examples/Tests/langmuir_fluid/inputs_1d_test_Langmuir_fluid_1d # inputs + Examples/Tests/langmuir_fluid/analysis_1d.py # analysis + diags/diag1000080 # output +) + +# Langmuir_fluid_2d ########################################################### +# +add_warpx_test( + Langmuir_fluid_2d # name + 2 # dims + ON # mpi + Examples/Tests/langmuir_fluid/inputs_2d_test_Langmuir_fluid_2d # inputs + Examples/Tests/langmuir_fluid/analysis_2d.py # analysis + diags/diag1000080 # output +) + +# Langmuir_fluid_3d ########################################################### +# +add_warpx_test( + Langmuir_fluid_3d # name + 3 # dims + ON # mpi + Examples/Tests/langmuir_fluid/inputs_3d_test_Langmuir_fluid_3d # inputs + Examples/Tests/langmuir_fluid/analysis_3d.py # analysis + diags/diag1000040 # output +) + +# Langmuir_fluid_rz ########################################################### +# +add_warpx_test( + Langmuir_fluid_rz # name + RZ # dims + ON # mpi + Examples/Tests/langmuir_fluid/inputs_rz_test_Langmuir_fluid_rz # inputs + Examples/Tests/langmuir_fluid/analysis_rz.py # analysis + diags/diag1000080 # output +) diff --git a/Examples/Tests/langmuir_fluids/inputs_1d b/Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_1d rename to Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d diff --git a/Examples/Tests/langmuir_fluids/inputs_2d b/Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_2d rename to Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d diff --git a/Examples/Tests/langmuir_fluids/inputs_3d b/Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_3d rename to Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d diff --git a/Examples/Tests/langmuir_fluids/inputs_rz b/Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_rz rename to Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt new file mode 100644 index 00000000000..e8090c18a4b --- /dev/null +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# Larmor ###################################################################### +# +add_warpx_test( + Larmor # name + 2 # dims + ON # mpi + Examples/Tests/larmor/inputs_2d_test_Larmor # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/larmor/inputs_2d_mr b/Examples/Tests/larmor/inputs_2d_test_Larmor similarity index 99% rename from Examples/Tests/larmor/inputs_2d_mr rename to Examples/Tests/larmor/inputs_2d_test_Larmor index 5d7af3d67a4..76e4f76ee22 100644 --- a/Examples/Tests/larmor/inputs_2d_mr +++ b/Examples/Tests/larmor/inputs_2d_test_Larmor @@ -1,5 +1,5 @@ # Maximum number of time steps -max_step = 400 +max_step = 10 # number of grid points amr.n_cell = 64 64 diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt new file mode 100644 index 00000000000..e8b92c7aef8 --- /dev/null +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# laser_injection_1d ########################################################## +# +add_warpx_test( + laser_injection_1d # name + 1 # dims + ON # mpi + Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d # inputs + Examples/Tests/laser_injection/analysis_1d.py # analysis + diags/diag1000240 # output +) + +# laser_injection_2d ########################################################## +# +add_warpx_test( + laser_injection_2d # name + 2 # dims + ON # mpi + Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d # inputs + Examples/Tests/laser_injection/analysis_2d.py # analysis + diags/diag1000240 # output +) + +# laser_injection_3d ########################################################## +# +add_warpx_test( + laser_injection_3d # name + 3 # dims + ON # mpi + Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d # inputs + Examples/Tests/laser_injection/analysis_3d.py # analysis + diags/diag1001000 # output +) diff --git a/Examples/Tests/laser_injection/analysis_laser.py b/Examples/Tests/laser_injection/analysis_3d.py similarity index 100% rename from Examples/Tests/laser_injection/analysis_laser.py rename to Examples/Tests/laser_injection/analysis_3d.py diff --git a/Examples/Tests/laser_injection/inputs_1d_rt b/Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d similarity index 100% rename from Examples/Tests/laser_injection/inputs_1d_rt rename to Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d diff --git a/Examples/Tests/laser_injection/inputs_2d_rt b/Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d similarity index 100% rename from Examples/Tests/laser_injection/inputs_2d_rt rename to Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d diff --git a/Examples/Tests/laser_injection/inputs_3d_rt b/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d similarity index 100% rename from Examples/Tests/laser_injection/inputs_3d_rt rename to Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt new file mode 100644 index 00000000000..2a2bb852e10 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -0,0 +1,79 @@ +# Add tests (alphabetical order) ############################################## +# + +# laser_injection_from_binary_file ############################################ +# +add_warpx_test( + laser_injection_from_binary_file # name + 2 # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs + Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_lasy_file_1d ########################################### +# +add_warpx_test( + laser_injection_from_lasy_file_1d # name + 1 # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs + Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_lasy_file_1d_boost ##################################### +# +add_warpx_test( + laser_injection_from_lasy_file_1d_boost # name + 1 # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs + Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_lasy_file_2d ########################################### +# +add_warpx_test( + laser_injection_from_lasy_file_2d # name + 2 # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs + Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_lasy_file_3d ########################################### +# +add_warpx_test( + laser_injection_from_lasy_file_3d # name + 3 # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs + Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_lasy_file_rz ########################################### +# +add_warpx_test( + laser_injection_from_lasy_file_rz # name + RZ # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs + Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis + diags/diag1000250 # output +) + +# laser_injection_from_rz_lasy_file ########################################### +# +add_warpx_test( + laser_injection_from_rz_lasy_file # name + RZ # dims + OFF # mpi + Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis + diags/diag1000250 # output +) diff --git a/Examples/Tests/laser_injection_from_file/inputs.1d_test b/Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.1d_test rename to Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d diff --git a/Examples/Tests/laser_injection_from_file/inputs.1d_boost_test b/Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.1d_boost_test rename to Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost diff --git a/Examples/Tests/laser_injection_from_file/inputs.2d_test_binary b/Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.2d_test_binary rename to Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file diff --git a/Examples/Tests/laser_injection_from_file/inputs.2d_test b/Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.2d_test rename to Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d diff --git a/Examples/Tests/laser_injection_from_file/inputs.3d_test b/Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.3d_test rename to Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d diff --git a/Examples/Tests/laser_injection_from_file/inputs.RZ_test b/Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.RZ_test rename to Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz diff --git a/Examples/Tests/laser_injection_from_file/inputs.from_RZ_file_test b/Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs.from_RZ_file_test rename to Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_1D.json b/Regression/Checksum/benchmarks_json/Langmuir_fluid_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_1D.json rename to Regression/Checksum/benchmarks_json/Langmuir_fluid_1d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_2D.json b/Regression/Checksum/benchmarks_json/Langmuir_fluid_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_2D.json rename to Regression/Checksum/benchmarks_json/Langmuir_fluid_2d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_multi.json b/Regression/Checksum/benchmarks_json/Langmuir_fluid_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_multi.json rename to Regression/Checksum/benchmarks_json/Langmuir_fluid_3d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_RZ.json b/Regression/Checksum/benchmarks_json/Langmuir_fluid_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_RZ.json rename to Regression/Checksum/benchmarks_json/Langmuir_fluid_rz.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_3d_picmi.json b/Regression/Checksum/benchmarks_json/Langmuir_multi_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_3d_picmi.json rename to Regression/Checksum/benchmarks_json/Langmuir_multi_picmi.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjection_1d.json b/Regression/Checksum/benchmarks_json/laser_injection_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjection_1d.json rename to Regression/Checksum/benchmarks_json/laser_injection_1d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjection_2d.json b/Regression/Checksum/benchmarks_json/laser_injection_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjection_2d.json rename to Regression/Checksum/benchmarks_json/laser_injection_2d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjection.json b/Regression/Checksum/benchmarks_json/laser_injection_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjection.json rename to Regression/Checksum/benchmarks_json/laser_injection_3d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromBINARYFile.json b/Regression/Checksum/benchmarks_json/laser_injection_from_binary_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromBINARYFile.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_binary_file.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_1d.json b/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_1d.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_1d_boost.json b/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d_boost.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_1d_boost.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d_boost.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_2d.json b/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_2d.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_2d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile.json b/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_3d.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_RZ.json b/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromLASYFile_RZ.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_rz.json diff --git a/Regression/Checksum/benchmarks_json/LaserInjectionFromRZLASYFile.json b/Regression/Checksum/benchmarks_json/laser_injection_from_rz_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserInjectionFromRZLASYFile.json rename to Regression/Checksum/benchmarks_json/laser_injection_from_rz_lasy_file.json From c1aee66dae1d1d5138fe8c0a0259152f3a6b9145 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 13:16:06 -0700 Subject: [PATCH 069/167] Fix broken tests --- Examples/Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 0f7784aeac4..cd8e0b8a648 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -19,7 +19,7 @@ add_subdirectory(initial_distribution) add_subdirectory(ionization) add_subdirectory(ion_stopping) add_subdirectory(langmuir) -add_subdirectory(langmuir_fluid) +add_subdirectory(langmuir_fluids) add_subdirectory(larmor) add_subdirectory(laser_injection) add_subdirectory(laser_injection_from_file) From 67a8dcf3740e8acf8b5ab14b998da457290050de Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 14:47:06 -0700 Subject: [PATCH 070/167] Add more tests --- Examples/Tests/CMakeLists.txt | 3 +++ Examples/Tests/laser_on_fine/CMakeLists.txt | 13 ++++++++++ ...inputs_2d => inputs_2d_test_laser_on_fine} | 2 +- .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 15 ++++++++++++ ... inputs_2d_test_maxwell_hybrid_qed_solver} | 2 +- .../Tests/nci_fdtd_stability/CMakeLists.txt | 24 +++++++++++++++++++ .../{inputs_2d => inputs_2d_base} | 0 .../inputs_2d_test_nci_corrector | 6 +++++ .../inputs_2d_test_nci_corrector_mr | 9 +++++++ .../Tests/nci_psatd_stability/CMakeLists.txt | 13 ++++++++++ .../inputs_rz_test_multi_J_rz_psatd} | 2 ++ .../{LaserOnFine.json => laser_on_fine.json} | 0 ...er.json => maxwell_hybrid_qed_solver.json} | 0 ...correctorMR.json => nci_corrector_mr.json} | 0 14 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 Examples/Tests/laser_on_fine/CMakeLists.txt rename Examples/Tests/laser_on_fine/{inputs_2d => inputs_2d_test_laser_on_fine} (99%) create mode 100644 Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt rename Examples/Tests/maxwell_hybrid_qed/{inputs_2d => inputs_2d_test_maxwell_hybrid_qed_solver} (98%) create mode 100644 Examples/Tests/nci_fdtd_stability/CMakeLists.txt rename Examples/Tests/nci_fdtd_stability/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector create mode 100644 Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr rename Examples/Tests/{multi_j/inputs_rz => nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd} (97%) rename Regression/Checksum/benchmarks_json/{LaserOnFine.json => laser_on_fine.json} (100%) rename Regression/Checksum/benchmarks_json/{Maxwell_Hybrid_QED_solver.json => maxwell_hybrid_qed_solver.json} (100%) rename Regression/Checksum/benchmarks_json/{nci_correctorMR.json => nci_corrector_mr.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index cd8e0b8a648..0cae0f6d580 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -23,6 +23,9 @@ add_subdirectory(langmuir_fluids) add_subdirectory(larmor) add_subdirectory(laser_injection) add_subdirectory(laser_injection_from_file) +add_subdirectory(laser_on_fine) +add_subdirectory(maxwell_hybrid_qed) add_subdirectory(nuclear_fusion) +add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) add_subdirectory(single_particle) diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt new file mode 100644 index 00000000000..c83e960311a --- /dev/null +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# laser_on_fine ############################################################### +# +add_warpx_test( + laser_on_fine # name + 2 # dims + ON # mpi + Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000050 # output +) diff --git a/Examples/Tests/laser_on_fine/inputs_2d b/Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine similarity index 99% rename from Examples/Tests/laser_on_fine/inputs_2d rename to Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine index 1ffbfcb7e09..61c10e81f3e 100644 --- a/Examples/Tests/laser_on_fine/inputs_2d +++ b/Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine @@ -1,5 +1,5 @@ # Maximum number of time steps -max_step = 500 +max_step = 50 # number of grid points amr.n_cell = 64 64 diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt new file mode 100644 index 00000000000..8786dce4a63 --- /dev/null +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -0,0 +1,15 @@ +# Add tests (alphabetical order) ############################################## +# + +# maxwell_hybrid_qed_solver ################################################### +# +if(WarpX_FFT) + add_warpx_test( + maxwell_hybrid_qed_solver # name + 2 # dims + ON # mpi + Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver # inputs + Examples/Tests/maxwell_hybrid_qed/analysis_2d.py # analysis + diags/diag1000300 # output + ) +endif() diff --git a/Examples/Tests/maxwell_hybrid_qed/inputs_2d b/Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver similarity index 98% rename from Examples/Tests/maxwell_hybrid_qed/inputs_2d rename to Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver index 2baa72c0990..8e1091c91e2 100644 --- a/Examples/Tests/maxwell_hybrid_qed/inputs_2d +++ b/Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver @@ -24,7 +24,7 @@ boundary.field_hi = periodic periodic algo.maxwell_solver = psatd warpx.verbose = 0 warpx.use_filter = 1 -warpx.cfl = 1. +warpx.cfl = 0.7071067811865475 warpx.use_hybrid_QED = 1 ################################# diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt new file mode 100644 index 00000000000..baa3eb1b56e --- /dev/null +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# nci_corrector ############################################################### +# +add_warpx_test( + nci_corrector # name + 2 # dims + ON # mpi + Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector # inputs + Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis + diags/diag1000600 # output +) + +# nci_corrector_mr ############################################################ +# +add_warpx_test( + nci_corrector_mr # name + 2 # dims + ON # mpi + Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr # inputs + Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis + diags/diag1000600 # output +) diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d b/Examples/Tests/nci_fdtd_stability/inputs_2d_base similarity index 100% rename from Examples/Tests/nci_fdtd_stability/inputs_2d rename to Examples/Tests/nci_fdtd_stability/inputs_2d_base diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector b/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector new file mode 100644 index 00000000000..5c25ec4d56a --- /dev/null +++ b/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +amr.max_level = 0 +particles.use_fdtd_nci_corr = 1 diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr b/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr new file mode 100644 index 00000000000..a9be762449e --- /dev/null +++ b/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr @@ -0,0 +1,9 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +amr.max_level = 1 +amr.n_cell = 64 64 +particles.use_fdtd_nci_corr = 1 +warpx.fine_tag_hi = 20.e-6 20.e-6 +warpx.fine_tag_lo = -20.e-6 -20.e-6 diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index c5338d971f6..1d08f331c14 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -195,3 +195,16 @@ if(WarpX_FFT) diags/diag1000400 # output ) endif() + +# multi_J_rz_psatd #################################### +# +if(WarpX_FFT) + add_warpx_test( + multi_J_rz_psatd # name + RZ # dims + ON # mpi + Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000050 # output + ) +endif() diff --git a/Examples/Tests/multi_j/inputs_rz b/Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd similarity index 97% rename from Examples/Tests/multi_j/inputs_rz rename to Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd index dd440d60667..5e263856256 100644 --- a/Examples/Tests/multi_j/inputs_rz +++ b/Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd @@ -28,6 +28,7 @@ warpx.moving_window_v = 1. warpx.n_rz_azimuthal_modes = 1 warpx.use_filter = 1 warpx.verbose = 1 +warpx.abort_on_warning_threshold = medium warpx.cfl = 1. #warpx.gamma_boost = 1. @@ -42,6 +43,7 @@ psatd.do_time_averaging = 1 # PSATD psatd.update_with_rho = 1 #psatd.v_galilean = 0. 0. -0.9373391857121336 +psatd.J_in_time = linear # Particles diff --git a/Regression/Checksum/benchmarks_json/LaserOnFine.json b/Regression/Checksum/benchmarks_json/laser_on_fine.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserOnFine.json rename to Regression/Checksum/benchmarks_json/laser_on_fine.json diff --git a/Regression/Checksum/benchmarks_json/Maxwell_Hybrid_QED_solver.json b/Regression/Checksum/benchmarks_json/maxwell_hybrid_qed_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Maxwell_Hybrid_QED_solver.json rename to Regression/Checksum/benchmarks_json/maxwell_hybrid_qed_solver.json diff --git a/Regression/Checksum/benchmarks_json/nci_correctorMR.json b/Regression/Checksum/benchmarks_json/nci_corrector_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/nci_correctorMR.json rename to Regression/Checksum/benchmarks_json/nci_corrector_mr.json From 27907387bb247518c7ff9f1d14b5e11cb0564420 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 15:47:01 -0700 Subject: [PATCH 071/167] Add more tests --- Examples/Tests/CMakeLists.txt | 2 ++ Examples/Tests/nodal_electrostatic/CMakeLists.txt | 13 +++++++++++++ ... => inputs_3d_test_nodal_electrostatic_solver} | 1 + .../Tests/open_bc_poisson_solver/CMakeLists.txt | 15 +++++++++++++++ .../analysis.py | 0 .../inputs_3d_test_open_bc_poisson_solver} | 0 ...olver.json => nodal_electrostatic_solver.json} | 0 ...on_solver.json => open_bc_poisson_solver.json} | 0 8 files changed, 31 insertions(+) create mode 100644 Examples/Tests/nodal_electrostatic/CMakeLists.txt rename Examples/Tests/nodal_electrostatic/{inputs_3d => inputs_3d_test_nodal_electrostatic_solver} (98%) create mode 100644 Examples/Tests/open_bc_poisson_solver/CMakeLists.txt rename Examples/Tests/{openbc_poisson_solver => open_bc_poisson_solver}/analysis.py (100%) rename Examples/Tests/{openbc_poisson_solver/inputs_3d => open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver} (100%) rename Regression/Checksum/benchmarks_json/{NodalElectrostaticSolver.json => nodal_electrostatic_solver.json} (100%) rename Regression/Checksum/benchmarks_json/{openbc_poisson_solver.json => open_bc_poisson_solver.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 0cae0f6d580..42abd4a710d 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -28,4 +28,6 @@ add_subdirectory(maxwell_hybrid_qed) add_subdirectory(nuclear_fusion) add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) +add_subdirectory(nodal_electrostatic) +add_subdirectory(open_bc_poisson_solver) add_subdirectory(single_particle) diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt new file mode 100644 index 00000000000..6c13f47715c --- /dev/null +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# nodal_electrostatic_solver ################################################## +# +add_warpx_test( + nodal_electrostatic_solver # name + 3 # dims + OFF # mpi + Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver # inputs + Examples/Tests/nodal_electrostatic/analysis_3d.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/nodal_electrostatic/inputs_3d b/Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver similarity index 98% rename from Examples/Tests/nodal_electrostatic/inputs_3d rename to Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver index 91732a2c8ff..f1fd206eee3 100644 --- a/Examples/Tests/nodal_electrostatic/inputs_3d +++ b/Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver @@ -35,6 +35,7 @@ boundary.field_hi = PEC PEC PEC warpx.do_electrostatic = relativistic warpx.const_dt = dt warpx.grid_type = collocated +warpx.abort_on_warning_threshold = high algo.particle_pusher = vay algo.particle_shape = 3 diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt new file mode 100644 index 00000000000..8eae8ff0c7b --- /dev/null +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -0,0 +1,15 @@ +# Add tests (alphabetical order) ############################################## +# + +# open_bc_poisson_solver ###################################################### +# +if(WarpX_FFT) + add_warpx_test( + open_bc_poisson_solver # name + 3 # dims + ON # mpi + Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver # inputs + Examples/Tests/open_bc_poisson_solver/analysis.py # analysis + diags/diag1000001 # output + ) +endif() diff --git a/Examples/Tests/openbc_poisson_solver/analysis.py b/Examples/Tests/open_bc_poisson_solver/analysis.py similarity index 100% rename from Examples/Tests/openbc_poisson_solver/analysis.py rename to Examples/Tests/open_bc_poisson_solver/analysis.py diff --git a/Examples/Tests/openbc_poisson_solver/inputs_3d b/Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver similarity index 100% rename from Examples/Tests/openbc_poisson_solver/inputs_3d rename to Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver diff --git a/Regression/Checksum/benchmarks_json/NodalElectrostaticSolver.json b/Regression/Checksum/benchmarks_json/nodal_electrostatic_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/NodalElectrostaticSolver.json rename to Regression/Checksum/benchmarks_json/nodal_electrostatic_solver.json diff --git a/Regression/Checksum/benchmarks_json/openbc_poisson_solver.json b/Regression/Checksum/benchmarks_json/open_bc_poisson_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/openbc_poisson_solver.json rename to Regression/Checksum/benchmarks_json/open_bc_poisson_solver.json From edc08d17ab05595aba4608c04435dd78b2e18f26 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 17:03:30 -0700 Subject: [PATCH 072/167] Fix broken tests --- .../laser_acceleration}/analysis_openpmd_rz.py | 0 Examples/Tests/langmuir_fluids/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) rename Examples/{Tests/openpmd_rz => Physics_applications/laser_acceleration}/analysis_openpmd_rz.py (100%) diff --git a/Examples/Tests/openpmd_rz/analysis_openpmd_rz.py b/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py similarity index 100% rename from Examples/Tests/openpmd_rz/analysis_openpmd_rz.py rename to Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 12c10f992e2..5eb96beca53 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -7,8 +7,8 @@ add_warpx_test( Langmuir_fluid_1d # name 1 # dims ON # mpi - Examples/Tests/langmuir_fluid/inputs_1d_test_Langmuir_fluid_1d # inputs - Examples/Tests/langmuir_fluid/analysis_1d.py # analysis + Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d # inputs + Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output ) @@ -18,8 +18,8 @@ add_warpx_test( Langmuir_fluid_2d # name 2 # dims ON # mpi - Examples/Tests/langmuir_fluid/inputs_2d_test_Langmuir_fluid_2d # inputs - Examples/Tests/langmuir_fluid/analysis_2d.py # analysis + Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d # inputs + Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output ) @@ -29,8 +29,8 @@ add_warpx_test( Langmuir_fluid_3d # name 3 # dims ON # mpi - Examples/Tests/langmuir_fluid/inputs_3d_test_Langmuir_fluid_3d # inputs - Examples/Tests/langmuir_fluid/analysis_3d.py # analysis + Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d # inputs + Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output ) @@ -40,7 +40,7 @@ add_warpx_test( Langmuir_fluid_rz # name RZ # dims ON # mpi - Examples/Tests/langmuir_fluid/inputs_rz_test_Langmuir_fluid_rz # inputs - Examples/Tests/langmuir_fluid/analysis_rz.py # analysis + Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz # inputs + Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output ) From 2adaf153e9a15d36ecfd73aec9b77b0181b856f7 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 17:26:04 -0700 Subject: [PATCH 073/167] Azure: always compile with Python, EB support --- .azure-pipelines.yml | 36 ++++++++++++------------------------ Examples/CMakeLists.txt | 5 ----- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 628dfa55319..4d126bc0442 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -28,38 +28,26 @@ jobs: matrix: # Cartesian 1D cartesian_1d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON - cartesian_1d_python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF - cartesian_1d_no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + cartesian_1d_nompi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cartesian 2D cartesian_2d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON - cartesian_2d_python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF - cartesian_2d_no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + cartesian_2d_nompi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cartesian 3D cartesian_3d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON - cartesian_3d_python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF - cartesian_3d_no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_MPI=OFF + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + cartesian_3d_nompi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cylindrical RZ cylindrical_rz: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON WARPX_RZ_FFT: 'TRUE' - cylindrical_rz_python: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_APP=OFF + cylindrical_rz_nompi: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF WARPX_RZ_FFT: 'TRUE' - cylindrical_rz_no_mpi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_MPI=OFF - WARPX_RZ_FFT: 'TRUE' - #embedded_boundary: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_EB=ON - # WARPX_RZ_FFT: 'TRUE' #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE # WARPX_RZ_FFT: 'TRUE' diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index fd857f70b8b..07583edf309 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -51,11 +51,6 @@ function(add_warpx_test return() endif() - # do not run no-Python tests w/ Python support - if(NOT python AND WarpX_PYTHON) - return() - endif() - # set dimension suffix warpx_set_suffix_dims(SD ${dims}) From ec7e34cf9f24da124e0f15b45e2e13e93671bd27 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 12 Aug 2024 17:57:29 -0700 Subject: [PATCH 074/167] Add more tests --- Examples/Tests/CMakeLists.txt | 5 ++ .../electrostatic_sphere_eb/CMakeLists.txt | 46 +++++++++++++++++++ ...=> inputs_3d_test_electrostatic_sphere_eb} | 1 + ..._3d_test_electrostatic_sphere_eb_mixed_bc} | 1 + ..._3d_test_electrostatic_sphere_eb_picmi.py} | 0 ...inputs_rz_test_electrostatic_sphere_eb_rz} | 1 + ...uts_rz_test_electrostatic_sphere_eb_rz_mr} | 2 + .../embedded_boundary_cube/CMakeLists.txt | 35 ++++++++++++++ ... inputs_2d_test_embedded_boundary_cube_2d} | 1 + .../{inputs_3d => inputs_3d_base} | 1 + .../inputs_3d_test_embedded_boundary_cube_3d | 2 + ...test_embedded_boundary_cube_3d_macroscopic | 8 ++++ .../CMakeLists.txt | 13 ++++++ .../analysis_fields.py | 4 +- ...uts_rz_test_embedded_boundary_diffraction} | 0 .../CMakeLists.txt | 13 ++++++ ...inputs_3d_test_embedded_boundary_picmi.py} | 6 +-- .../CMakeLists.txt | 24 ++++++++++ ...alysis_fields.py => analysis_fields_3d.py} | 0 ...2d_test_embedded_boundary_rotated_cube_2d} | 1 + ...3d_test_embedded_boundary_rotated_cube_3d} | 1 + ...reEB.json => electrostatic_sphere_eb.json} | 0 ... => electrostatic_sphere_eb_mixed_bc.json} | 0 ...Z.json => electrostatic_sphere_eb_rz.json} | 0 ...son => electrostatic_sphere_eb_rz_mr.json} | 0 ...be.json => embedded_boundary_cube_3d.json} | 0 ...mbedded_boundary_cube_3d_macroscopic.json} | 0 ...son => embedded_boundary_diffraction.json} | 0 ...=> embedded_boundary_rotated_cube_3d.json} | 0 29 files changed, 158 insertions(+), 7 deletions(-) create mode 100644 Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt rename Examples/Tests/electrostatic_sphere_eb/{inputs_3d => inputs_3d_test_electrostatic_sphere_eb} (96%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_3d_mixed_BCs => inputs_3d_test_electrostatic_sphere_eb_mixed_bc} (94%) rename Examples/Tests/electrostatic_sphere_eb/{PICMI_inputs_3d.py => inputs_3d_test_electrostatic_sphere_eb_picmi.py} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_rz => inputs_rz_test_electrostatic_sphere_eb_rz} (94%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_rz_mr => inputs_rz_test_electrostatic_sphere_eb_rz_mr} (92%) create mode 100644 Examples/Tests/embedded_boundary_cube/CMakeLists.txt rename Examples/Tests/embedded_boundary_cube/{inputs_2d => inputs_2d_test_embedded_boundary_cube_2d} (97%) rename Examples/Tests/embedded_boundary_cube/{inputs_3d => inputs_3d_base} (97%) create mode 100644 Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d create mode 100644 Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic create mode 100644 Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt rename Examples/Tests/embedded_boundary_diffraction/{inputs_rz => inputs_rz_test_embedded_boundary_diffraction} (100%) create mode 100644 Examples/Tests/embedded_boundary_python_api/CMakeLists.txt rename Examples/Tests/embedded_boundary_python_api/{PICMI_inputs_EB_API.py => inputs_3d_test_embedded_boundary_picmi.py} (96%) create mode 100644 Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt rename Examples/Tests/embedded_boundary_rotated_cube/{analysis_fields.py => analysis_fields_3d.py} (100%) rename Examples/Tests/embedded_boundary_rotated_cube/{inputs_2d => inputs_2d_test_embedded_boundary_rotated_cube_2d} (96%) rename Examples/Tests/embedded_boundary_rotated_cube/{inputs_3d => inputs_3d_test_embedded_boundary_rotated_cube_3d} (98%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereEB.json => electrostatic_sphere_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereEB_mixedBCs.json => electrostatic_sphere_eb_mixed_bc.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereEB_RZ.json => electrostatic_sphere_eb_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{ElectrostaticSphereEB_RZ_MR.json => electrostatic_sphere_eb_rz_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_cube.json => embedded_boundary_cube_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_cube_macroscopic.json => embedded_boundary_cube_3d_macroscopic.json} (100%) rename Regression/Checksum/benchmarks_json/{EmbeddedBoundaryDiffraction.json => embedded_boundary_diffraction.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_rotated_cube.json => embedded_boundary_rotated_cube_3d.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 42abd4a710d..b379377f7d7 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -11,6 +11,11 @@ add_subdirectory(divb_cleaning) add_subdirectory(dive_cleaning) add_subdirectory(electrostatic_dirichlet_bc) add_subdirectory(electrostatic_sphere) +add_subdirectory(electrostatic_sphere_eb) +add_subdirectory(embedded_boundary_cube) +add_subdirectory(embedded_boundary_diffraction) +add_subdirectory(embedded_boundary_python_api) +add_subdirectory(embedded_boundary_rotated_cube) add_subdirectory(energy_conserving_thermal_plasma) add_subdirectory(flux_injection) add_subdirectory(gaussian_beam) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt new file mode 100644 index 00000000000..75606d8ba93 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -0,0 +1,46 @@ +# Add tests (alphabetical order) ############################################## +# + +# electrostatic_sphere_eb ##################################################### +# +add_warpx_test( + electrostatic_sphere_eb # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs + Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis + diags/diag1000001 # output +) + +# electrostatic_sphere_eb_mixed_bc ############################################ +# +add_warpx_test( + electrostatic_sphere_eb_mixed_bc # name + 3 # dims + ON # mpi + Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output +) + +# electrostatic_sphere_eb_rz ################################################## +# +add_warpx_test( + electrostatic_sphere_eb_rz # name + RZ # dims + ON # mpi + Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs + Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis + diags/diag1000001 # output +) + +# electrostatic_sphere_eb_rz_mr ############################################### +# +add_warpx_test( + electrostatic_sphere_eb_rz_mr # name + RZ # dims + ON # mpi + Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs + Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis + diags/diag1/ # output +) diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb similarity index 96% rename from Examples/Tests/electrostatic_sphere_eb/inputs_3d rename to Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb index 13ad42da070..f738e1c5d3a 100644 --- a/Examples/Tests/electrostatic_sphere_eb/inputs_3d +++ b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb @@ -20,6 +20,7 @@ warpx.do_electrostatic = labframe warpx.eb_implicit_function = "-(x**2+y**2+z**2-0.1**2)" warpx.eb_potential(x,y,z,t) = "1." warpx.self_fields_required_precision = 1.e-7 +warpx.abort_on_warning_threshold = medium algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_mixed_BCs b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc similarity index 94% rename from Examples/Tests/electrostatic_sphere_eb/inputs_3d_mixed_BCs rename to Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc index 0c1b9130ded..de2c0d0646c 100644 --- a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_mixed_BCs +++ b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc @@ -17,6 +17,7 @@ warpx.do_electrostatic = labframe warpx.eb_implicit_function = "-(x**2+y**2+z**2-0.3**2)" warpx.eb_potential(x,y,z,t) = "1." warpx.self_fields_required_precision = 1.e-7 +warpx.abort_on_warning_threshold = medium algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/electrostatic_sphere_eb/PICMI_inputs_3d.py b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/PICMI_inputs_3d.py rename to Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_rz b/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz similarity index 94% rename from Examples/Tests/electrostatic_sphere_eb/inputs_rz rename to Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz index 28ebadb1cc7..8ace9cd9b4a 100644 --- a/Examples/Tests/electrostatic_sphere_eb/inputs_rz +++ b/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz @@ -20,6 +20,7 @@ warpx.do_electrostatic = labframe warpx.eb_implicit_function = "-(x**2-0.1**2)" warpx.eb_potential(x,y,z,t) = "1." warpx.self_fields_required_precision = 1.e-7 +warpx.abort_on_warning_threshold = medium algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_rz_mr b/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr similarity index 92% rename from Examples/Tests/electrostatic_sphere_eb/inputs_rz_mr rename to Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr index 722fc916416..d984ba35b5d 100644 --- a/Examples/Tests/electrostatic_sphere_eb/inputs_rz_mr +++ b/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr @@ -6,6 +6,7 @@ max_step = 1 amr.n_cell = 64 64 amr.blocking_factor = 8 amr.max_grid_size = 128 +amr.ref_ratio_vect = 2 2 2 boundary.field_lo = none periodic boundary.field_hi = pec periodic boundary.potential_lo_x = 0 @@ -23,6 +24,7 @@ warpx.do_electrostatic = labframe warpx.eb_implicit_function = "-(x**2-0.1**2)" warpx.eb_potential(x,y,z,t) = "1." warpx.self_fields_required_precision = 1.e-7 +warpx.abort_on_warning_threshold = medium algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt new file mode 100644 index 00000000000..7b853b5d407 --- /dev/null +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# embedded_boundary_cube_2d ################################################### +# +add_warpx_test( + embedded_boundary_cube_2d # name + 2 # dims + OFF # mpi + Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis + diags/diag1000114 # output +) + +# embedded_boundary_cube_3d ################################################### +# +add_warpx_test( + embedded_boundary_cube_3d # name + 3 # dims + OFF # mpi + Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + diags/diag1000208 # output +) + +# embedded_boundary_cube_3d_macroscopic ####################################### +# +add_warpx_test( + embedded_boundary_cube_3d_macroscopic # name + 3 # dims + OFF # mpi + Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + diags/diag1000208 # output +) diff --git a/Examples/Tests/embedded_boundary_cube/inputs_2d b/Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d similarity index 97% rename from Examples/Tests/embedded_boundary_cube/inputs_2d rename to Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d index 372e0dc0340..684325dc030 100644 --- a/Examples/Tests/embedded_boundary_cube/inputs_2d +++ b/Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d @@ -7,6 +7,7 @@ geometry.dims = 2 geometry.prob_lo = -0.8 -0.8 geometry.prob_hi = 0.8 0.8 warpx.cfl = 1 +warpx.abort_on_warning_threshold = medium boundary.field_lo = pec pec boundary.field_hi = pec pec diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d b/Examples/Tests/embedded_boundary_cube/inputs_3d_base similarity index 97% rename from Examples/Tests/embedded_boundary_cube/inputs_3d rename to Examples/Tests/embedded_boundary_cube/inputs_3d_base index 61eb1192e04..9710701d871 100644 --- a/Examples/Tests/embedded_boundary_cube/inputs_3d +++ b/Examples/Tests/embedded_boundary_cube/inputs_3d_base @@ -7,6 +7,7 @@ geometry.dims = 3 geometry.prob_lo = -0.8 -0.8 -0.8 geometry.prob_hi = 0.8 0.8 0.8 warpx.cfl = 1 +warpx.abort_on_warning_threshold = medium boundary.field_lo = pec pec pec boundary.field_hi = pec pec pec diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d b/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d new file mode 100644 index 00000000000..7cd29a5648b --- /dev/null +++ b/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d @@ -0,0 +1,2 @@ +# base inpute parameters +FILE = inputs_3d_base diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic b/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic new file mode 100644 index 00000000000..647c8836524 --- /dev/null +++ b/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.em_solver_medium = macroscopic +macroscopic.epsilon = 1.5*8.8541878128e-12 +macroscopic.mu = 1.25663706212e-06 +macroscopic.sigma = 0 diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt new file mode 100644 index 00000000000..d02acc43e5e --- /dev/null +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# embedded_boundary_diffraction ############################################### +# +add_warpx_test( + embedded_boundary_diffraction # name + RZ # dims + ON # mpi + Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs + Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis + diags/diag1/ # output +) diff --git a/Examples/Tests/embedded_boundary_diffraction/analysis_fields.py b/Examples/Tests/embedded_boundary_diffraction/analysis_fields.py index da344f332a1..ff6b745aef5 100755 --- a/Examples/Tests/embedded_boundary_diffraction/analysis_fields.py +++ b/Examples/Tests/embedded_boundary_diffraction/analysis_fields.py @@ -16,7 +16,8 @@ sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI -ts = OpenPMDTimeSeries('./EmbeddedBoundaryDiffraction_plt/') +filename = sys.argv[1] +ts = OpenPMDTimeSeries(filename) # Extract the intensity as a function of r and z Ex, info = ts.get_field('E', 'x', iteration=300) @@ -36,6 +37,5 @@ def r_first_minimum(iz): assert np.all( abs(r[50:] - theta_diffraction*info.z[50:]) < 0.03 ) # Open the right plot file -filename = sys.argv[1] test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename, output_format='openpmd') diff --git a/Examples/Tests/embedded_boundary_diffraction/inputs_rz b/Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction similarity index 100% rename from Examples/Tests/embedded_boundary_diffraction/inputs_rz rename to Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt new file mode 100644 index 00000000000..450f87d4b0b --- /dev/null +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# embedded_boundary_python_api ################################################ +# +add_warpx_test( + embedded_boundary_picmi # name + 3 # dims + OFF # mpi + Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs + Examples/Tests/embedded_boundary_python_api/analysis.py # analysis + diags/diag1000002 +) diff --git a/Examples/Tests/embedded_boundary_python_api/PICMI_inputs_EB_API.py b/Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py similarity index 96% rename from Examples/Tests/embedded_boundary_python_api/PICMI_inputs_EB_API.py rename to Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py index faec3ed4668..82a35daac32 100755 --- a/Examples/Tests/embedded_boundary_python_api/PICMI_inputs_EB_API.py +++ b/Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py @@ -60,17 +60,13 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', - period = 1, - write_dir = '.', - warpx_file_prefix = "embedded_boundary_python_API_plt" + period = 1 ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 1, data_list = ['Ex'], - write_dir = '.', - warpx_file_prefix = "embedded_boundary_python_API_plt" ) ########################## diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt new file mode 100644 index 00000000000..d8b8753ec8f --- /dev/null +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# embedded_boundary_rotated_cube_2d ########################################### +# +add_warpx_test( + embedded_boundary_rotated_cube_2d # name + 2 # dims + OFF # mpi + Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs + Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis + diags/diag1000068 +) + +# embedded_boundary_rotated_cube_3d ########################################### +# +add_warpx_test( + embedded_boundary_rotated_cube_3d # name + 3 # dims + OFF # mpi + Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs + Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis + diags/diag1000111 +) diff --git a/Examples/Tests/embedded_boundary_rotated_cube/analysis_fields.py b/Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py similarity index 100% rename from Examples/Tests/embedded_boundary_rotated_cube/analysis_fields.py rename to Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py diff --git a/Examples/Tests/embedded_boundary_rotated_cube/inputs_2d b/Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d similarity index 96% rename from Examples/Tests/embedded_boundary_rotated_cube/inputs_2d rename to Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d index e7e03168824..24fb2938c2d 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/inputs_2d +++ b/Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d @@ -7,6 +7,7 @@ geometry.dims = 2 geometry.prob_lo = -0.8 -0.8 geometry.prob_hi = 0.8 0.8 warpx.cfl = 1 +warpx.abort_on_warning_threshold = medium boundary.field_lo = pec pec boundary.field_hi = pec pec diff --git a/Examples/Tests/embedded_boundary_rotated_cube/inputs_3d b/Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d similarity index 98% rename from Examples/Tests/embedded_boundary_rotated_cube/inputs_3d rename to Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d index 77e259e8975..faefeec2206 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/inputs_3d +++ b/Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d @@ -7,6 +7,7 @@ geometry.dims = 3 geometry.prob_lo = -0.8 -0.8 -0.8 geometry.prob_hi = 0.8 0.8 0.8 warpx.cfl = 1 +warpx.abort_on_warning_threshold = medium boundary.field_lo = pec pec pec boundary.field_hi = pec pec pec diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereEB.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_eb.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_mixedBCs.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_mixed_bc.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_mixedBCs.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_mixed_bc.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz.json diff --git a/Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ElectrostaticSphereEB_RZ_MR.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz_mr.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_cube.json b/Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_cube.json rename to Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_cube_macroscopic.json b/Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d_macroscopic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_cube_macroscopic.json rename to Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d_macroscopic.json diff --git a/Regression/Checksum/benchmarks_json/EmbeddedBoundaryDiffraction.json b/Regression/Checksum/benchmarks_json/embedded_boundary_diffraction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/EmbeddedBoundaryDiffraction.json rename to Regression/Checksum/benchmarks_json/embedded_boundary_diffraction.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube.json b/Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube.json rename to Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_3d.json From de7b61f7621d48b76dfb5f8274323def599eae87 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 13 Aug 2024 15:06:13 -0700 Subject: [PATCH 075/167] Simplify Azure matrix, fix broken tests --- .azure-pipelines.yml | 9 -- Examples/CMakeLists.txt | 36 +++-- .../capacitive_discharge/CMakeLists.txt | 12 +- .../laser_acceleration/CMakeLists.txt | 4 +- .../Tests/accelerator_lattice/CMakeLists.txt | 12 +- Examples/Tests/boosted_diags/CMakeLists.txt | 4 +- Examples/Tests/boundaries/CMakeLists.txt | 4 +- Examples/Tests/btd_rz/CMakeLists.txt | 2 +- .../collider_relevant_diags/CMakeLists.txt | 4 +- Examples/Tests/collision/CMakeLists.txt | 24 ++-- Examples/Tests/divb_cleaning/CMakeLists.txt | 4 +- Examples/Tests/dive_cleaning/CMakeLists.txt | 8 +- .../electrostatic_dirichlet_bc/CMakeLists.txt | 8 +- .../Tests/electrostatic_sphere/CMakeLists.txt | 18 +-- .../electrostatic_sphere_eb/CMakeLists.txt | 12 +- .../embedded_boundary_cube/CMakeLists.txt | 12 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 8 +- .../CMakeLists.txt | 4 +- Examples/Tests/flux_injection/CMakeLists.txt | 6 +- Examples/Tests/gaussian_beam/CMakeLists.txt | 4 +- Examples/Tests/implicit/CMakeLists.txt | 16 +-- .../Tests/initial_distribution/CMakeLists.txt | 4 +- Examples/Tests/ion_stopping/CMakeLists.txt | 4 +- Examples/Tests/ionization/CMakeLists.txt | 12 +- Examples/Tests/langmuir/CMakeLists.txt | 132 +++++++++--------- Examples/Tests/langmuir_fluids/CMakeLists.txt | 14 +- Examples/Tests/larmor/CMakeLists.txt | 4 +- Examples/Tests/laser_injection/CMakeLists.txt | 12 +- .../laser_injection_from_file/CMakeLists.txt | 28 ++-- Examples/Tests/laser_on_fine/CMakeLists.txt | 4 +- .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 6 +- ...ysis_Maxwell_QED_Hybrid.py => analysis.py} | 0 .../Tests/nci_fdtd_stability/CMakeLists.txt | 8 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 60 ++++---- .../Tests/nodal_electrostatic/CMakeLists.txt | 4 +- Examples/Tests/nuclear_fusion/CMakeLists.txt | 22 +-- .../open_bc_poisson_solver/CMakeLists.txt | 4 +- Examples/Tests/single_particle/CMakeLists.txt | 4 +- 40 files changed, 263 insertions(+), 276 deletions(-) rename Examples/Tests/maxwell_hybrid_qed/{analysis_Maxwell_QED_Hybrid.py => analysis.py} (100%) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4d126bc0442..0a3d96b1d1a 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -29,25 +29,16 @@ jobs: # Cartesian 1D cartesian_1d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON - cartesian_1d_nompi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cartesian 2D cartesian_2d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON - cartesian_2d_nompi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cartesian 3D cartesian_3d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON - cartesian_3d_nompi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF # Cylindrical RZ cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON WARPX_RZ_FFT: 'TRUE' - cylindrical_rz_nompi: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON -DWarpX_MPI=OFF - WARPX_RZ_FFT: 'TRUE' #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE # WARPX_RZ_FFT: 'TRUE' diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 07583edf309..08d531d3504 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -20,20 +20,21 @@ endif() function(add_warpx_test name dims - mpi + nprocs inputs analysis output ) - # cannot run MPI tests w/o MPI support - if(mpi AND NOT WarpX_MPI) + # cannot run MPI tests w/o MPI build + if(NOT WarpX_MPI) + message(WARNING "cannot run MPI tests without MPI build") return() endif() - # do not run no-MPI tests w/ MPI support - if(NOT mpi AND WarpX_MPI) - return() - endif() + ## do not run no-MPI tests w/ MPI build + #if(NOT mpi AND WarpX_MPI) + # return() + #endif() # cannot run tests with unsupported geometry if(NOT dims IN_LIST WarpX_DIMS) @@ -64,16 +65,13 @@ function(add_warpx_test file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*") file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) - set(THIS_MPI_TEST_EXE) - if(mpi) - set(THIS_MPI_TEST_EXE - ${MPIEXEC_EXECUTABLE} - ${MPI_ALLOW_ROOT} - ${MPIEXEC_NUMPROC_FLAG} 2 - ${MPIEXEC_POSTFLAGS} - ${MPIEXEC_PREFLAGS} - ) - endif() + set(THIS_MPI_TEST_EXE + ${MPIEXEC_EXECUTABLE} + ${MPI_ALLOW_ROOT} + ${MPIEXEC_NUMPROC_FLAG} ${nprocs} + ${MPIEXEC_POSTFLAGS} + ${MPIEXEC_PREFLAGS} + ) set(THIS_Python_EXE) if(python) @@ -116,9 +114,7 @@ function(add_warpx_test ) endif() - if(mpi) - set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") - endif() + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") # test analysis if(analysis) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index bdc4380706e..4ae4ce99813 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -3,8 +3,8 @@ add_warpx_test( background_mcc # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output @@ -15,8 +15,8 @@ add_warpx_test( # #add_warpx_test( # background_mcc_dp_psp # name -# 2 # dims -# ON # mpi +# 2 # dims +# 2 # nprocs # Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output @@ -24,8 +24,8 @@ add_warpx_test( add_warpx_test( Python_background_mcc # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 2a95e3c0938..49fcb41acf9 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -3,8 +3,8 @@ add_warpx_test( Python_LaserAcceleration_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index d0def7f512f..882d28be076 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( hard_edged_quadrupoles # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( hard_edged_quadrupoles_boosted # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( hard_edged_quadrupoles_moving # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 84b78c9bad7..903fb47a609 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( laser_acceleration_btd # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index 56614ac513f..9428865c315 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( particle_boundaries_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index beda624b6e7..f401e065553 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -6,7 +6,7 @@ add_warpx_test( BTD_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/btd_rz/inputs_rz_test_BTD_rz # inputs Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index 021c803b70d..c620a4c69ee 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( collider_diagnostics # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 348efad1be8..b2e7ad24a97 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( collision_z # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/collision/inputs_1d_test_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( collision_iso # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/collision/inputs_3d_test_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( collision_rz # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/collision/inputs_rz_test_collision_rz # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output @@ -38,8 +38,8 @@ add_warpx_test( # add_warpx_test( collision_xyz # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/collision/inputs_3d_test_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis collision_xyz_plt000150 # output @@ -49,8 +49,8 @@ add_warpx_test( # add_warpx_test( collision_xz # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/collision/inputs_2d_test_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis collision_xz_plt000150 # output @@ -60,8 +60,8 @@ add_warpx_test( # add_warpx_test( collision_xz_picmi # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis collision_xz_plt000150 # output diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index ef72f9e1407..25bc90d7cfe 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( divb_cleaning_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index ed4b7ac1938..2f5db4a30fc 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( dive_cleaning_2d # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( dive_cleaning_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 88911247eac..911659dc9c1 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( dirichlet_bc # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( dirichlet_bc_picmi # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 3927842d325..597e0b16aeb 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( electrostatic_sphere # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( electrostatic_sphere_lab_frame # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( electrostatic_sphere_lab_frame_MR_emass_10 # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output @@ -38,8 +38,8 @@ add_warpx_test( # add_warpx_test( electrostatic_sphere_rel_nodal # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -50,7 +50,7 @@ add_warpx_test( add_warpx_test( electrostatic_sphere_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 75606d8ba93..d54e54b7d1c 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( electrostatic_sphere_eb # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( electrostatic_sphere_eb_mixed_bc # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -28,7 +28,7 @@ add_warpx_test( add_warpx_test( electrostatic_sphere_eb_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output @@ -39,7 +39,7 @@ add_warpx_test( add_warpx_test( electrostatic_sphere_eb_rz_mr # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 7b853b5d407..3a6c500fd48 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( embedded_boundary_cube_2d # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( embedded_boundary_cube_3d # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( embedded_boundary_cube_3d_macroscopic # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index d02acc43e5e..3758f964a89 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -6,7 +6,7 @@ add_warpx_test( embedded_boundary_diffraction # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 450f87d4b0b..0aa77d6e781 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( embedded_boundary_picmi # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index d8b8753ec8f..9f8f45ebb12 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( embedded_boundary_rotated_cube_2d # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( embedded_boundary_rotated_cube_3d # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index b9875ea4208..aeb6771e193 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( energy_conserving_thermal_plasma # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 176d54ab909..3d0b477831c 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( flux_injection_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output @@ -17,7 +17,7 @@ add_warpx_test( add_warpx_test( flux_injection_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 3dbd4908140..a136a337f70 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -3,8 +3,8 @@ add_warpx_test( Python_gaussian_beam # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index ac10297246f..229e2d990a5 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( semi_implicit_picard_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( theta_implicit_jfnk_vandb_2d # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( theta_implicit_jfnk_vandb_2d_picmi # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output @@ -38,8 +38,8 @@ add_warpx_test( # add_warpx_test( theta_implicit_picard_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 3ad44ace0ca..22852cbb15b 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( initial_distribution # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution # inputs Examples/Tests/initial_distribution/analysis_distribution.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index e65b080dd00..46fd7683e39 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( ion_stopping # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping # inputs Examples/Tests/ion_stopping/analysis_ion_stopping.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index 302bdf1fb95..ed0f9562d3a 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( ionization_boost # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/ionization/inputs_2d_test_ionization_boost # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1000420 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( ionization_lab # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/ionization/inputs_2d_test_ionization_lab # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1001600 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( ionization_picmi # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1001600 # output diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 7bfed7c336a..a7610febcfd 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( Langmuir_multi # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_2d_MR # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -38,8 +38,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_2d_MR_anisotropic # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -49,8 +49,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_2d_MR_momentum_conserving # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -61,8 +61,8 @@ add_warpx_test( if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_MR_psatd # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -73,8 +73,8 @@ endif() # add_warpx_test( Langmuir_multi_2d_nodal # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -84,8 +84,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_2d_picmi # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -96,8 +96,8 @@ add_warpx_test( if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -109,8 +109,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_current_correction # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -122,8 +122,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_current_correction_nodal # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -135,8 +135,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_momentum_conserving # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -148,8 +148,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_multiJ # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -161,8 +161,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_multiJ_nodal # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -174,8 +174,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_nodal # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -187,8 +187,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_Vay_deposition # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -201,8 +201,8 @@ endif() #if(WarpX_FFT) # add_warpx_test( # Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name -# 2 # dims -# OFF # mpi +# 2 # dims +# 1 # nprocs # Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output @@ -214,8 +214,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_2d_psatd_Vay_deposition_nodal # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -226,8 +226,8 @@ endif() # add_warpx_test( Langmuir_multi_nodal # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -237,8 +237,8 @@ add_warpx_test( # add_warpx_test( Langmuir_multi_picmi # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -249,8 +249,8 @@ add_warpx_test( if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -262,8 +262,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_current_correction # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -275,8 +275,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_current_correction_nodal # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -288,8 +288,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_div_cleaning # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -301,8 +301,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_momentum_conserving # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -314,8 +314,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_multiJ # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -327,8 +327,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_multiJ_nodal # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -340,8 +340,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_nodal # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -353,8 +353,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_Vay_deposition # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -366,8 +366,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_psatd_Vay_deposition_nodal # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -379,7 +379,7 @@ endif() add_warpx_test( Langmuir_multi_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -390,7 +390,7 @@ add_warpx_test( add_warpx_test( Langmuir_multi_rz_picmi # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -402,7 +402,7 @@ if(WarpX_FFT) add_warpx_test( Langmuir_multi_rz_psatd # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -414,8 +414,8 @@ endif() if(WarpX_FFT) add_warpx_test( Langmuir_multi_rz_psatd_correction # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -428,7 +428,7 @@ if(WarpX_FFT) add_warpx_test( Langmuir_multi_rz_psatd_multiJ # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 5eb96beca53..3f6a1073344 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( Langmuir_fluid_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( Langmuir_fluid_2d # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( Langmuir_fluid_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output @@ -39,7 +39,7 @@ add_warpx_test( add_warpx_test( Langmuir_fluid_rz # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index e8090c18a4b..634c8b5b8ae 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( Larmor # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/larmor/inputs_2d_test_Larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index e8b92c7aef8..99f098c5caa 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( laser_injection_1d # name - 1 # dims - ON # mpi + 1 # dims + 2 # nprocs Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( laser_injection_2d # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( laser_injection_3d # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1001000 # output diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 2a2bb852e10..68fd0516bd4 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( laser_injection_from_binary_file # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis diags/diag1000250 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_lasy_file_1d # name - 1 # dims - OFF # mpi + 1 # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis diags/diag1000250 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_lasy_file_1d_boost # name - 1 # dims - OFF # mpi + 1 # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis diags/diag1000250 # output @@ -38,8 +38,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_lasy_file_2d # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis diags/diag1000250 # output @@ -49,8 +49,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_lasy_file_3d # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis diags/diag1000250 # output @@ -60,8 +60,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_lasy_file_rz # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis diags/diag1000250 # output @@ -71,8 +71,8 @@ add_warpx_test( # add_warpx_test( laser_injection_from_rz_lasy_file # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis diags/diag1000250 # output diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index c83e960311a..8aa2197b3e4 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( laser_on_fine # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index 8786dce4a63..1da13bfcce0 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -6,10 +6,10 @@ if(WarpX_FFT) add_warpx_test( maxwell_hybrid_qed_solver # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver # inputs - Examples/Tests/maxwell_hybrid_qed/analysis_2d.py # analysis + Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output ) endif() diff --git a/Examples/Tests/maxwell_hybrid_qed/analysis_Maxwell_QED_Hybrid.py b/Examples/Tests/maxwell_hybrid_qed/analysis.py similarity index 100% rename from Examples/Tests/maxwell_hybrid_qed/analysis_Maxwell_QED_Hybrid.py rename to Examples/Tests/maxwell_hybrid_qed/analysis.py diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index baa3eb1b56e..fbdcc38a2c7 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( nci_corrector # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( nci_corrector_mr # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 1d08f331c14..c30ec891cfa 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -6,8 +6,8 @@ if(WarpX_FFT) add_warpx_test( averaged_galilean_2d_psatd # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -19,8 +19,8 @@ endif() if(WarpX_FFT) add_warpx_test( averaged_galilean_2d_psatd_hybrid # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -32,8 +32,8 @@ endif() if(WarpX_FFT) add_warpx_test( averaged_galilean_3d_psatd # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -45,8 +45,8 @@ endif() if(WarpX_FFT) add_warpx_test( averaged_galilean_3d_psatd_hybrid # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -58,8 +58,8 @@ endif() if(WarpX_FFT) add_warpx_test( comoving_2d_psatd_hybrid # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -71,8 +71,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_2d_psatd # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -84,8 +84,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_2d_psatd_current_correction # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -97,8 +97,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_2d_psatd_current_correction_psb # name - 2 # dims - OFF # mpi + 2 # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -110,8 +110,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_2d_psatd_hybrid # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -123,8 +123,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_3d_psatd # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -136,8 +136,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_3d_psatd_current_correction # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -149,8 +149,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_3d_psatd_current_correction_psb # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -162,8 +162,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_rz_psatd # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -176,7 +176,7 @@ if(WarpX_FFT) add_warpx_test( galilean_rz_psatd_current_correction # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -188,8 +188,8 @@ endif() if(WarpX_FFT) add_warpx_test( galilean_rz_psatd_current_correction_psb # name - RZ # dims - OFF # mpi + RZ # dims + 1 # nprocs Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -202,7 +202,7 @@ if(WarpX_FFT) add_warpx_test( multi_J_rz_psatd # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 6c13f47715c..9146934c8bb 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( nodal_electrostatic_solver # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver # inputs Examples/Tests/nodal_electrostatic/analysis_3d.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index cb070d18379..8b562fe3c5a 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( Deuterium_Deuterium_Fusion_3D # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -16,8 +16,8 @@ add_warpx_test( # add_warpx_test( Deuterium_Deuterium_Fusion_3D_intraspecies # name - 3 # dims - OFF # mpi + 3 # dims + 1 # nprocs Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output @@ -27,8 +27,8 @@ add_warpx_test( # add_warpx_test( Deuterium_Tritium_Fusion_3D # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -39,7 +39,7 @@ add_warpx_test( add_warpx_test( Deuterium_Tritium_Fusion_RZ # name RZ # dims - ON # mpi + 2 # nprocs Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -49,8 +49,8 @@ add_warpx_test( # add_warpx_test( Proton_Boron_Fusion_2D # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output @@ -60,8 +60,8 @@ add_warpx_test( # add_warpx_test( Proton_Boron_Fusion_3D # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index 8eae8ff0c7b..4fdf943b357 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -6,8 +6,8 @@ if(WarpX_FFT) add_warpx_test( open_bc_poisson_solver # name - 3 # dims - ON # mpi + 3 # dims + 2 # nprocs Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index fdde6f619dc..d6c8b4986a1 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -5,8 +5,8 @@ # add_warpx_test( bilinear_filter # name - 2 # dims - ON # mpi + 2 # dims + 2 # nprocs Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output From e511632ec99da1d17b9a4e623e08c3b72efaec42 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 13 Aug 2024 15:37:52 -0700 Subject: [PATCH 076/167] Add more tests --- Examples/CMakeLists.txt | 2 +- Examples/Tests/CMakeLists.txt | 14 +++++ Examples/Tests/embedded_circle/CMakeLists.txt | 13 +++++ ...puts_2d => inputs_2d_test_embedded_circle} | 0 Examples/Tests/langmuir/CMakeLists.txt | 2 +- .../Tests/load_external_field/CMakeLists.txt | 48 ++++++++++++++++ .../analysis_3d.py | 0 .../analysis_rz.py | 0 ...test_load_external_field_3d_grid_picmi.py} | 4 -- ..._load_external_field_3d_particle_picmi.py} | 4 -- ...nputs_rz_test_load_external_field_rz_grid} | 0 ...s_rz_test_load_external_field_rz_particle} | 0 .../Tests/magnetostatic_eb/CMakeLists.txt | 35 ++++++++++++ ..._3d => inputs_3d_test_magnetostatic_eb_3d} | 0 ...puts_3d_test_magnetostatic_eb_3d_picmi.py} | 4 -- ...puts_rz_test_magnetostatic_eb_rz_picmi.py} | 4 -- .../CMakeLists.txt | 13 +++++ ...st_particle_boundary_interaction_picmi.py} | 4 -- .../particle_boundary_process/CMakeLists.txt | 24 ++++++++ ...puts_2d_test_particle_reflection_picmi.py} | 0 ...ion => inputs_3d_test_particle_absorption} | 0 .../particle_boundary_scrape/CMakeLists.txt | 24 ++++++++ ..._scrape => inputs_3d_test_particle_scrape} | 0 ...> inputs_3d_test_particle_scrape_picmi.py} | 4 -- .../Tests/particle_data_python/CMakeLists.txt | 36 ++++++++++++ ...uts_2d_test_particle_attr_access_picmi.py} | 4 -- ...=> inputs_2d_test_prev_positions_picmi.py} | 4 -- .../particle_fields_diags/CMakeLists.txt | 25 ++++++++ ...s => inputs_3d_test_particle_fields_diags} | 0 Examples/Tests/particle_pusher/CMakeLists.txt | 13 +++++ ...puts_3d => inputs_3d_test_particle_pusher} | 0 .../particle_thermal_boundary/CMakeLists.txt | 13 +++++ ... inputs_2d_test_particle_thermal_boundary} | 0 .../Tests/particles_in_pml/CMakeLists.txt | 46 +++++++++++++++ ..._2d => inputs_2d_test_particles_in_pml_2d} | 0 ... => inputs_2d_test_particles_in_pml_2d_mr} | 0 ..._3d => inputs_3d_test_particles_in_pml_3d} | 0 ... => inputs_3d_test_particles_in_pml_3d_mr} | 0 .../pass_mpi_communicator/CMakeLists.txt | 13 +++++ ... => inputs_2d_test_pass_mpi_comm_picmi.py} | 0 Examples/Tests/pec/CMakeLists.txt | 35 ++++++++++++ ..._field_PEC_3d => inputs_3d_test_pec_field} | 0 ..._PEC_mr_3d => inputs_3d_test_pec_field_mr} | 0 ...cle_PEC_3d => inputs_3d_test_pec_particle} | 0 Examples/Tests/photon_pusher/CMakeLists.txt | 13 +++++ ...inputs_3d => inputs_3d_test_photon_pusher} | 0 Examples/Tests/plasma_lens/CMakeLists.txt | 57 +++++++++++++++++++ Examples/Tests/plasma_lens/analysis.py | 4 +- .../{inputs_3d => inputs_3d_test_plasma_lens} | 0 ..._3d => inputs_3d_test_plasma_lens_boosted} | 0 ... => inputs_3d_test_plasma_lens_hard_edged} | 0 ...py => inputs_3d_test_plasma_lens_picmi.py} | 8 +-- ...rt_3d => inputs_3d_test_plasma_lens_short} | 0 ...=> load_external_field_3d_grid_picmi.json} | 0 ...oad_external_field_3d_particle_picmi.json} | 0 ....json => load_external_field_rz_grid.json} | 0 ... => load_external_field_rz_particles.json} | 0 ...3d.json => magnetostatic_eb_3d_picmi.json} | 0 ...rz.json => magnetostatic_eb_rz_picmi.json} | 0 ...2d_MR.json => particles_in_pml_2d_mr.json} | 0 ...s_in_pml.json => particles_in_pml_3d.json} | 0 ...3d_MR.json => particles_in_pml_3d_mr.json} | 0 .../{PEC_field.json => pec_field.json} | 0 .../{PEC_field_mr.json => pec_field_mr.json} | 0 .../{PEC_particle.json => pec_particle.json} | 0 .../{Plasma_lens.json => plasma_lens.json} | 0 ..._boosted.json => plasma_lens_boosted.json} | 0 ..._lens.json => plasma_lens_hard_edged.json} | 0 ...lens_short.json => plasma_lens_short.json} | 0 69 files changed, 428 insertions(+), 42 deletions(-) create mode 100644 Examples/Tests/embedded_circle/CMakeLists.txt rename Examples/Tests/embedded_circle/{inputs_2d => inputs_2d_test_embedded_circle} (100%) create mode 100644 Examples/Tests/load_external_field/CMakeLists.txt rename Examples/Tests/{LoadExternalField => load_external_field}/analysis_3d.py (100%) rename Examples/Tests/{LoadExternalField => load_external_field}/analysis_rz.py (100%) rename Examples/Tests/{LoadExternalField/PICMI_inputs_3d_grid_fields.py => load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py} (95%) rename Examples/Tests/{LoadExternalField/PICMI_inputs_3d_particle_fields.py => load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py} (94%) rename Examples/Tests/{LoadExternalField/inputs_rz_grid_fields => load_external_field/inputs_rz_test_load_external_field_rz_grid} (100%) rename Examples/Tests/{LoadExternalField/inputs_rz_particle_fields => load_external_field/inputs_rz_test_load_external_field_rz_particle} (100%) create mode 100644 Examples/Tests/magnetostatic_eb/CMakeLists.txt rename Examples/Tests/magnetostatic_eb/{inputs_3d => inputs_3d_test_magnetostatic_eb_3d} (100%) rename Examples/Tests/magnetostatic_eb/{PICMI_inputs_3d.py => inputs_3d_test_magnetostatic_eb_3d_picmi.py} (97%) rename Examples/Tests/magnetostatic_eb/{PICMI_inputs_rz.py => inputs_rz_test_magnetostatic_eb_rz_picmi.py} (97%) create mode 100644 Examples/Tests/particle_boundary_interaction/CMakeLists.txt rename Examples/Tests/particle_boundary_interaction/{PICMI_inputs_rz.py => inputs_rz_test_particle_boundary_interaction_picmi.py} (96%) create mode 100644 Examples/Tests/particle_boundary_process/CMakeLists.txt rename Examples/Tests/particle_boundary_process/{PICMI_inputs_reflection.py => inputs_2d_test_particle_reflection_picmi.py} (100%) rename Examples/Tests/particle_boundary_process/{inputs_absorption => inputs_3d_test_particle_absorption} (100%) create mode 100644 Examples/Tests/particle_boundary_scrape/CMakeLists.txt rename Examples/Tests/particle_boundary_scrape/{inputs_scrape => inputs_3d_test_particle_scrape} (100%) rename Examples/Tests/particle_boundary_scrape/{PICMI_inputs_scrape.py => inputs_3d_test_particle_scrape_picmi.py} (96%) create mode 100644 Examples/Tests/particle_data_python/CMakeLists.txt rename Examples/Tests/particle_data_python/{PICMI_inputs_2d.py => inputs_2d_test_particle_attr_access_picmi.py} (94%) rename Examples/Tests/particle_data_python/{PICMI_inputs_prev_pos_2d.py => inputs_2d_test_prev_positions_picmi.py} (95%) create mode 100644 Examples/Tests/particle_fields_diags/CMakeLists.txt rename Examples/Tests/particle_fields_diags/{inputs => inputs_3d_test_particle_fields_diags} (100%) create mode 100644 Examples/Tests/particle_pusher/CMakeLists.txt rename Examples/Tests/particle_pusher/{inputs_3d => inputs_3d_test_particle_pusher} (100%) create mode 100644 Examples/Tests/particle_thermal_boundary/CMakeLists.txt rename Examples/Tests/particle_thermal_boundary/{inputs_2d => inputs_2d_test_particle_thermal_boundary} (100%) create mode 100644 Examples/Tests/particles_in_pml/CMakeLists.txt rename Examples/Tests/particles_in_pml/{inputs_2d => inputs_2d_test_particles_in_pml_2d} (100%) rename Examples/Tests/particles_in_pml/{inputs_mr_2d => inputs_2d_test_particles_in_pml_2d_mr} (100%) rename Examples/Tests/particles_in_pml/{inputs_3d => inputs_3d_test_particles_in_pml_3d} (100%) rename Examples/Tests/particles_in_pml/{inputs_mr_3d => inputs_3d_test_particles_in_pml_3d_mr} (100%) create mode 100644 Examples/Tests/pass_mpi_communicator/CMakeLists.txt rename Examples/Tests/pass_mpi_communicator/{PICMI_inputs_2d.py => inputs_2d_test_pass_mpi_comm_picmi.py} (100%) create mode 100644 Examples/Tests/pec/CMakeLists.txt rename Examples/Tests/pec/{inputs_field_PEC_3d => inputs_3d_test_pec_field} (100%) rename Examples/Tests/pec/{inputs_field_PEC_mr_3d => inputs_3d_test_pec_field_mr} (100%) rename Examples/Tests/pec/{inputs_particle_PEC_3d => inputs_3d_test_pec_particle} (100%) create mode 100644 Examples/Tests/photon_pusher/CMakeLists.txt rename Examples/Tests/photon_pusher/{inputs_3d => inputs_3d_test_photon_pusher} (100%) create mode 100644 Examples/Tests/plasma_lens/CMakeLists.txt rename Examples/Tests/plasma_lens/{inputs_3d => inputs_3d_test_plasma_lens} (100%) rename Examples/Tests/plasma_lens/{inputs_boosted_3d => inputs_3d_test_plasma_lens_boosted} (100%) rename Examples/Tests/plasma_lens/{inputs_lattice_3d => inputs_3d_test_plasma_lens_hard_edged} (100%) rename Examples/Tests/plasma_lens/{PICMI_inputs_3d.py => inputs_3d_test_plasma_lens_picmi.py} (91%) rename Examples/Tests/plasma_lens/{inputs_short_3d => inputs_3d_test_plasma_lens_short} (100%) rename Regression/Checksum/benchmarks_json/{Python_LoadExternalGridField3D.json => load_external_field_3d_grid_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LoadExternalParticleField3D.json => load_external_field_3d_particle_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{LoadExternalFieldRZGrid.json => load_external_field_rz_grid.json} (100%) rename Regression/Checksum/benchmarks_json/{LoadExternalFieldRZParticles.json => load_external_field_rz_particles.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_magnetostatic_eb_3d.json => magnetostatic_eb_3d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_magnetostatic_eb_rz.json => magnetostatic_eb_rz_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_2d_MR.json => particles_in_pml_2d_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml.json => particles_in_pml_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_3d_MR.json => particles_in_pml_3d_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{PEC_field.json => pec_field.json} (100%) rename Regression/Checksum/benchmarks_json/{PEC_field_mr.json => pec_field_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{PEC_particle.json => pec_particle.json} (100%) rename Regression/Checksum/benchmarks_json/{Plasma_lens.json => plasma_lens.json} (100%) rename Regression/Checksum/benchmarks_json/{Plasma_lens_boosted.json => plasma_lens_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{hard_edged_plasma_lens.json => plasma_lens_hard_edged.json} (100%) rename Regression/Checksum/benchmarks_json/{Plasma_lens_short.json => plasma_lens_short.json} (100%) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 08d531d3504..86940457493 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -62,7 +62,7 @@ function(add_warpx_test # copy local input files to run directory get_filename_component(INPUTS_PATH ${inputs} REALPATH BASE_DIR "${CMAKE_BINARYDIR}") get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) - file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*") + file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*" "${INPUTS_DIR}/*.py") file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) set(THIS_MPI_TEST_EXE diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index b379377f7d7..a94405e0365 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -29,10 +29,24 @@ add_subdirectory(larmor) add_subdirectory(laser_injection) add_subdirectory(laser_injection_from_file) add_subdirectory(laser_on_fine) +add_subdirectory(load_external_field) +add_subdirectory(magnetostatic_eb) add_subdirectory(maxwell_hybrid_qed) add_subdirectory(nuclear_fusion) add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) add_subdirectory(nodal_electrostatic) add_subdirectory(open_bc_poisson_solver) +add_subdirectory(particle_boundary_interaction) +add_subdirectory(particle_boundary_process) +add_subdirectory(particle_boundary_scrape) +add_subdirectory(particle_data_python) +add_subdirectory(particle_fields_diags) +add_subdirectory(particle_pusher) +add_subdirectory(particle_thermal_boundary) +add_subdirectory(particles_in_pml) +add_subdirectory(pass_mpi_communicator) +add_subdirectory(pec) +add_subdirectory(photon_pusher) +add_subdirectory(plasma_lens) add_subdirectory(single_particle) diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt new file mode 100644 index 00000000000..6bf5c06b846 --- /dev/null +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# embedded_circle ############################################################# +# +add_warpx_test( + embedded_circle # name + 2 # dims + 2 # nprocs + Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle # inputs + Examples/Tests/embedded_circle/analysis.py # analysis + diags/diag1000011 +) diff --git a/Examples/Tests/embedded_circle/inputs_2d b/Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle similarity index 100% rename from Examples/Tests/embedded_circle/inputs_2d rename to Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index a7610febcfd..ec65c56654c 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -413,7 +413,7 @@ endif() # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_rz_psatd_correction # name + Langmuir_multi_rz_psatd_current_correction # name RZ # dims 1 # nprocs Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction # inputs diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt new file mode 100644 index 00000000000..ab126ec9b41 --- /dev/null +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -0,0 +1,48 @@ +# Add tests (alphabetical order) ############################################## +# + +# load_external_field_3d_grid_picmi ########################################### +# +add_warpx_test( + load_external_field_3d_grid_picmi # name + 3 # dims + 1 # nprocs + Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py # inputs + Examples/Tests/load_external_field/analysis_3d.py # analysis + diags/diag1000300 # output +) + +# load_external_field_3d_particle_picmi ####################################### +# +add_warpx_test( + load_external_field_3d_particle_picmi # name + 3 # dims + 1 # nprocs + Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py # inputs + Examples/Tests/load_external_field/analysis_3d.py # analysis + diags/diag1000300 # output +) + +# FIXME +# load_external_field_rz_grid ################################################# +# +#add_warpx_test( +# load_external_field_rz_grid # name +# RZ # dims +# 1 # nprocs +# Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid # inputs +# Examples/Tests/load_external_field/analysis_rz.py # analysis +# diags/diag1000300 # output +#) + +# FIXME +# load_external_field_rz_particle ############################################# +# +#add_warpx_test( +# load_external_field_rz_particle # name +# RZ # dims +# 1 # nprocs +# Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle # inputs +# Examples/Tests/load_external_field/analysis_rz.py # analysis +# diags/diag1000300 # output +#) diff --git a/Examples/Tests/LoadExternalField/analysis_3d.py b/Examples/Tests/load_external_field/analysis_3d.py similarity index 100% rename from Examples/Tests/LoadExternalField/analysis_3d.py rename to Examples/Tests/load_external_field/analysis_3d.py diff --git a/Examples/Tests/LoadExternalField/analysis_rz.py b/Examples/Tests/load_external_field/analysis_rz.py similarity index 100% rename from Examples/Tests/LoadExternalField/analysis_rz.py rename to Examples/Tests/load_external_field/analysis_rz.py diff --git a/Examples/Tests/LoadExternalField/PICMI_inputs_3d_grid_fields.py b/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py similarity index 95% rename from Examples/Tests/LoadExternalField/PICMI_inputs_3d_grid_fields.py rename to Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py index d128d9c10e0..046469fddb7 100644 --- a/Examples/Tests/LoadExternalField/PICMI_inputs_3d_grid_fields.py +++ b/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py @@ -92,16 +92,12 @@ period=300, species=[ions], data_list = ['ux', 'uy', 'uz', 'x', 'y', 'z', 'weighting'], - write_dir='.', - warpx_file_prefix='Python_LoadExternalGridField3D_plt' ) field_diag = picmi.FieldDiagnostic( name='diag1', grid=grid, period=300, data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], - write_dir='.', - warpx_file_prefix='Python_LoadExternalGridField3D_plt' ) ################################# diff --git a/Examples/Tests/LoadExternalField/PICMI_inputs_3d_particle_fields.py b/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py similarity index 94% rename from Examples/Tests/LoadExternalField/PICMI_inputs_3d_particle_fields.py rename to Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py index 7bf7c5a084c..de5b84aa6ca 100644 --- a/Examples/Tests/LoadExternalField/PICMI_inputs_3d_particle_fields.py +++ b/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py @@ -92,16 +92,12 @@ period=300, species=[ions], data_list = ['ux', 'uy', 'uz', 'x', 'y', 'z', 'weighting'], - write_dir='.', - warpx_file_prefix='Python_LoadExternalParticleField3D_plt' ) field_diag = picmi.FieldDiagnostic( name='diag1', grid=grid, period=300, data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], - write_dir='.', - warpx_file_prefix='Python_LoadExternalParticleField3D_plt' ) ################################# diff --git a/Examples/Tests/LoadExternalField/inputs_rz_grid_fields b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid similarity index 100% rename from Examples/Tests/LoadExternalField/inputs_rz_grid_fields rename to Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid diff --git a/Examples/Tests/LoadExternalField/inputs_rz_particle_fields b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle similarity index 100% rename from Examples/Tests/LoadExternalField/inputs_rz_particle_fields rename to Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt new file mode 100644 index 00000000000..de8c12c783d --- /dev/null +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# magnetostatic_eb_3d ######################################################### +# +add_warpx_test( + magnetostatic_eb_3d # name + 3 # dims + 1 # nprocs + Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output +) + +# magnetostatic_eb_3d_picmi ################################################### +# +add_warpx_test( + magnetostatic_eb_3d_picmi # name + 3 # dims + 1 # nprocs + Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output +) + +# magnetostatic_eb_rz_picmi ################################################### +# +add_warpx_test( + magnetostatic_eb_rz_picmi # name + RZ # dims + 1 # nprocs + Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py # inputs + Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/magnetostatic_eb/inputs_3d b/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d similarity index 100% rename from Examples/Tests/magnetostatic_eb/inputs_3d rename to Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d diff --git a/Examples/Tests/magnetostatic_eb/PICMI_inputs_3d.py b/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py similarity index 97% rename from Examples/Tests/magnetostatic_eb/PICMI_inputs_3d.py rename to Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py index 8f205724563..da37ea525c4 100755 --- a/Examples/Tests/magnetostatic_eb/PICMI_inputs_3d.py +++ b/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py @@ -116,16 +116,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 1, - write_dir = '.', - warpx_file_prefix = 'Python_magnetostatic_eb_3d_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 1, data_list = ['Ex', 'Ey', 'Ez', 'Bx', 'By', 'Bz','Ax', 'Ay', 'Az', 'Jx', 'Jy', 'Jz', 'phi', 'rho'], - write_dir = '.', - warpx_file_prefix = 'Python_magnetostatic_eb_3d_plt' ) ########################## diff --git a/Examples/Tests/magnetostatic_eb/PICMI_inputs_rz.py b/Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py similarity index 97% rename from Examples/Tests/magnetostatic_eb/PICMI_inputs_rz.py rename to Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py index e46f561f538..b054e3ac816 100755 --- a/Examples/Tests/magnetostatic_eb/PICMI_inputs_rz.py +++ b/Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py @@ -113,16 +113,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 1, - write_dir = '.', - warpx_file_prefix = 'Python_magnetostatic_eb_rz_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 1, data_list = ['Er', 'Bt', 'Az', 'Jz', 'phi', 'rho'], - write_dir = '.', - warpx_file_prefix = 'Python_magnetostatic_eb_rz_plt' ) ########################## diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt new file mode 100644 index 00000000000..f136168d224 --- /dev/null +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_boundary_interaction ############################################### +# +add_warpx_test( + particle_boundary_interaction # name + RZ # dims + 2 # nprocs + Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs + Examples/Tests/particle_boundary_interaction/analysis.py # analysis + diags/diag1000023 # output +) diff --git a/Examples/Tests/particle_boundary_interaction/PICMI_inputs_rz.py b/Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py similarity index 96% rename from Examples/Tests/particle_boundary_interaction/PICMI_inputs_rz.py rename to Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py index df4a4579e2f..1a130f9c5a0 100644 --- a/Examples/Tests/particle_boundary_interaction/PICMI_inputs_rz.py +++ b/Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py @@ -75,16 +75,12 @@ period = diagnostic_interval, data_list = ['Er', 'Ez', 'phi', 'rho','rho_electrons'], warpx_format = 'openpmd', - write_dir = '.', - warpx_file_prefix = 'particle_boundary_interaction_plt' ) part_diag = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_interval, species = [electrons], warpx_format = 'openpmd', - write_dir = '.', - warpx_file_prefix = 'particle_boundary_interaction_plt' ) ########################## diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt new file mode 100644 index 00000000000..4ff4733b07f --- /dev/null +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_absorption ######################################################### +# +add_warpx_test( + particle_absorption # name + 3 # dims + 2 # nprocs + Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption # inputs + Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis + diags/diag1000060 # output +) + +# particle_reflection_picmi ################################################### +# +add_warpx_test( + particle_reflection_picmi # name + 2 # dims + 1 # nprocs + Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py # inputs + Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/particle_boundary_process/PICMI_inputs_reflection.py b/Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py similarity index 100% rename from Examples/Tests/particle_boundary_process/PICMI_inputs_reflection.py rename to Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py diff --git a/Examples/Tests/particle_boundary_process/inputs_absorption b/Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption similarity index 100% rename from Examples/Tests/particle_boundary_process/inputs_absorption rename to Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt new file mode 100644 index 00000000000..d038702f9c0 --- /dev/null +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -0,0 +1,24 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_scrape ############################################################# +# +add_warpx_test( + particle_scrape # name + 3 # dims + 2 # nprocs + Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape # inputs + Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + diags/diag1000060 # output +) + +# particle_scrape_picmi ####################################################### +# +add_warpx_test( + particle_scrape_picmi # name + 3 # dims + 2 # nprocs + Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py # inputs + Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + diags/diag1000060 # output +) diff --git a/Examples/Tests/particle_boundary_scrape/inputs_scrape b/Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape similarity index 100% rename from Examples/Tests/particle_boundary_scrape/inputs_scrape rename to Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape diff --git a/Examples/Tests/particle_boundary_scrape/PICMI_inputs_scrape.py b/Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py similarity index 96% rename from Examples/Tests/particle_boundary_scrape/PICMI_inputs_scrape.py rename to Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py index e5a9a58f597..9b9fd26a2a5 100755 --- a/Examples/Tests/particle_boundary_scrape/PICMI_inputs_scrape.py +++ b/Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py @@ -76,16 +76,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = diagnostic_intervals, - write_dir = '.', - warpx_file_prefix = 'Python_particle_scrape_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = diagnostic_intervals, data_list = ['Ex', 'Ey', 'Ez', 'Bx', 'By', 'Bz'], - write_dir = '.', - warpx_file_prefix = 'Python_particle_scrape_plt' ) ########################## diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt new file mode 100644 index 00000000000..2068c6f6748 --- /dev/null +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -0,0 +1,36 @@ +# Add tests (alphabetical order) ############################################## +# + +# prev_positions_picmi ######################################################## +# +add_warpx_test( + prev_positions_picmi # name + 2 # dims + 2 # nprocs + Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# particle_attr_access_picmi ################################################## +# +add_warpx_test( + particle_attr_access_picmi # name + 2 # dims + 2 # nprocs + Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs + Examples/Tests/particle_data_python/analysis.py # analysis + diags/diag1000010 # output +) + +# FIXME +# particle_attr_access_unique_picmi ################################################## +# +#add_warpx_test( +# particle_attr_access_unique_picmi # name +# 2 # dims +# 2 # nprocs +# Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs +# Examples/Tests/particle_data_python/analysis.py # analysis +# diags/diag1000010 # output +#) diff --git a/Examples/Tests/particle_data_python/PICMI_inputs_2d.py b/Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py similarity index 94% rename from Examples/Tests/particle_data_python/PICMI_inputs_2d.py rename to Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py index 572871b8ed5..814b2871f8c 100755 --- a/Examples/Tests/particle_data_python/PICMI_inputs_2d.py +++ b/Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py @@ -73,16 +73,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 10, - write_dir = '.', - warpx_file_prefix = f"Python_particle_attr_access_{'unique_' if args.unique else ''}plt" ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 10, data_list = ['phi'], - write_dir = '.', - warpx_file_prefix = f"Python_particle_attr_access_{'unique_' if args.unique else ''}plt" ) ########################## diff --git a/Examples/Tests/particle_data_python/PICMI_inputs_prev_pos_2d.py b/Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py similarity index 95% rename from Examples/Tests/particle_data_python/PICMI_inputs_prev_pos_2d.py rename to Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py index 5de9879f0f8..b13ae0831ef 100755 --- a/Examples/Tests/particle_data_python/PICMI_inputs_prev_pos_2d.py +++ b/Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py @@ -75,16 +75,12 @@ name = 'diag1', period = 10, species=[electrons], - write_dir = '.', - warpx_file_prefix = 'Python_prev_positions_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', data_list=['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], period = 10, grid=grid, - write_dir = '.', - warpx_file_prefix = 'Python_prev_positions_plt' ) ########################## # simulation setup diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt new file mode 100644 index 00000000000..8c9697187a0 --- /dev/null +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -0,0 +1,25 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_fields_diags ####################################################### +# +add_warpx_test( + particle_fields_diags # name + 3 # dims + 2 # nprocs + Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags # inputs + Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis + diags/diag1000200 # output +) + +# FIXME +# particle_fields_diags_single_precision ###################################### +# +#add_warpx_test( +# particle_fields_diags_single_precision # name +# 3 # dims +# 2 # nprocs +# Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags_single_precision # inputs +# Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis +# diags/diag1000200 # output +#) diff --git a/Examples/Tests/particle_fields_diags/inputs b/Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags similarity index 100% rename from Examples/Tests/particle_fields_diags/inputs rename to Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt new file mode 100644 index 00000000000..0d4fb95c6b8 --- /dev/null +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_pusher ############################################################# +# +add_warpx_test( + particle_pusher # name + 3 # dims + 1 # nprocs + Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher # inputs + Examples/Tests/particle_pusher/analysis_pusher.py # analysis + diags/diag1010000 # output +) diff --git a/Examples/Tests/particle_pusher/inputs_3d b/Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher similarity index 100% rename from Examples/Tests/particle_pusher/inputs_3d rename to Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt new file mode 100644 index 00000000000..5bd649d90c6 --- /dev/null +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# particle_thermal_boundary ################################################### +# +add_warpx_test( + particle_thermal_boundary # name + 2 # dims + 2 # nprocs + Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary # inputs + Examples/Tests/particle_thermal_boundary/analysis_2d.py # analysis + diags/diag1002000 # output +) diff --git a/Examples/Tests/particle_thermal_boundary/inputs_2d b/Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary similarity index 100% rename from Examples/Tests/particle_thermal_boundary/inputs_2d rename to Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt new file mode 100644 index 00000000000..898e037de2d --- /dev/null +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -0,0 +1,46 @@ +# Add tests (alphabetical order) ############################################## +# + +# particles_in_pml_2d ######################################################### +# +add_warpx_test( + particles_in_pml_2d # name + 2 # dims + 2 # nprocs + Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d # inputs + Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + diags/diag1000180 # output +) + +# particles_in_pml_2d_mr ###################################################### +# +add_warpx_test( + particles_in_pml_2d_mr # name + 2 # dims + 2 # nprocs + Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr # inputs + Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + diags/diag1000300 # output +) + +# particles_in_pml_3d ######################################################### +# +add_warpx_test( + particles_in_pml_3d # name + 3 # dims + 2 # nprocs + Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d # inputs + Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + diags/diag1000120 # output +) + +# particles_in_pml_3d_mr ###################################################### +# +add_warpx_test( + particles_in_pml_3d_mr # name + 3 # dims + 2 # nprocs + Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr # inputs + Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + diags/diag1000200 # output +) diff --git a/Examples/Tests/particles_in_pml/inputs_2d b/Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_2d rename to Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d diff --git a/Examples/Tests/particles_in_pml/inputs_mr_2d b/Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_mr_2d rename to Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr diff --git a/Examples/Tests/particles_in_pml/inputs_3d b/Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_3d rename to Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d diff --git a/Examples/Tests/particles_in_pml/inputs_mr_3d b/Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_mr_3d rename to Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt new file mode 100644 index 00000000000..ba55cd3acf4 --- /dev/null +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# pass_mpi_comm_picmi ######################################################### +# +add_warpx_test( + pass_mpi_comm_picmi # name + 2 # dims + 2 # nprocs + Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py # inputs + Examples/Tests/pass_mpi_communicator/analysis.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Tests/pass_mpi_communicator/PICMI_inputs_2d.py b/Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py similarity index 100% rename from Examples/Tests/pass_mpi_communicator/PICMI_inputs_2d.py rename to Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt new file mode 100644 index 00000000000..d388e0896d0 --- /dev/null +++ b/Examples/Tests/pec/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +# pec_field ################################################################### +# +add_warpx_test( + pec_field # name + 3 # dims + 2 # nprocs + Examples/Tests/pec/inputs_3d_test_pec_field # inputs + Examples/Tests/pec/analysis_pec.py # analysis + diags/diag1000125 # output +) + +# pec_field_mr ################################################################ +# +add_warpx_test( + pec_field_mr # name + 3 # dims + 2 # nprocs + Examples/Tests/pec/inputs_3d_test_pec_field_mr # inputs + Examples/Tests/pec/analysis_pec_mr.py # analysis + diags/diag1000125 # output +) + +# pec_particle ################################################################ +# +add_warpx_test( + pec_particle # name + 3 # dims + 2 # nprocs + Examples/Tests/pec/inputs_3d_test_pec_particle # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000020 # output +) diff --git a/Examples/Tests/pec/inputs_field_PEC_3d b/Examples/Tests/pec/inputs_3d_test_pec_field similarity index 100% rename from Examples/Tests/pec/inputs_field_PEC_3d rename to Examples/Tests/pec/inputs_3d_test_pec_field diff --git a/Examples/Tests/pec/inputs_field_PEC_mr_3d b/Examples/Tests/pec/inputs_3d_test_pec_field_mr similarity index 100% rename from Examples/Tests/pec/inputs_field_PEC_mr_3d rename to Examples/Tests/pec/inputs_3d_test_pec_field_mr diff --git a/Examples/Tests/pec/inputs_particle_PEC_3d b/Examples/Tests/pec/inputs_3d_test_pec_particle similarity index 100% rename from Examples/Tests/pec/inputs_particle_PEC_3d rename to Examples/Tests/pec/inputs_3d_test_pec_particle diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt new file mode 100644 index 00000000000..27015aceac2 --- /dev/null +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +# photon_pusher ############################################################### +# +add_warpx_test( + photon_pusher # name + 3 # dims + 2 # nprocs + Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher # inputs + Examples/Tests/photon_pusher/analysis_photon_pusher.py # analysis + diags/diag1000050 # output +) diff --git a/Examples/Tests/photon_pusher/inputs_3d b/Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher similarity index 100% rename from Examples/Tests/photon_pusher/inputs_3d rename to Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt new file mode 100644 index 00000000000..32df47ea033 --- /dev/null +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -0,0 +1,57 @@ +# Add tests (alphabetical order) ############################################## +# + +# plasma_lens ################################################################# +# +add_warpx_test( + plasma_lens # name + 3 # dims + 2 # nprocs + Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens # inputs + Examples/Tests/plasma_lens/analysis.py # analysis + diags/diag1000084 # output +) + +# plasma_lens_boosted ######################################################### +# +add_warpx_test( + plasma_lens_boosted # name + 3 # dims + 2 # nprocs + Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted # inputs + Examples/Tests/plasma_lens/analysis.py # analysis + diags/diag1000084 # output +) + +# plasma_lens_hard_edged ###################################################### +# +add_warpx_test( + plasma_lens_hard_edged # name + 3 # dims + 2 # nprocs + Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged # inputs + Examples/Tests/plasma_lens/analysis.py # analysis + diags/diag1000084 # output +) + +# plasma_lens_picmi ########################################################### +# +add_warpx_test( + plasma_lens_picmi # name + 3 # dims + 2 # nprocs + Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py # inputs + Examples/Tests/plasma_lens/analysis.py # analysis + diags/diag1000084 # output +) + +# plasma_lens_short ########################################################### +# +add_warpx_test( + plasma_lens_short # name + 3 # dims + 2 # nprocs + Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short # inputs + Examples/Tests/plasma_lens/analysis.py # analysis + diags/diag1000084 # output +) diff --git a/Examples/Tests/plasma_lens/analysis.py b/Examples/Tests/plasma_lens/analysis.py index 212e71087f9..eaf498be9cd 100755 --- a/Examples/Tests/plasma_lens/analysis.py +++ b/Examples/Tests/plasma_lens/analysis.py @@ -166,7 +166,7 @@ def applylens(x0, vx0, vz0, gamma, lens_length, lens_strength): test_name = os.path.split(os.getcwd())[1] # The PICMI and native input versions of `inputs_3d` run the same test, so # their results are compared to the same benchmark file. -if test_name == "Python_plasma_lens": - test_name = "Plasma_lens" +if test_name == "plasma_lens_picmi": + test_name = "plasma_lens" checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/plasma_lens/inputs_3d b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d rename to Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens diff --git a/Examples/Tests/plasma_lens/inputs_boosted_3d b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted similarity index 100% rename from Examples/Tests/plasma_lens/inputs_boosted_3d rename to Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted diff --git a/Examples/Tests/plasma_lens/inputs_lattice_3d b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged similarity index 100% rename from Examples/Tests/plasma_lens/inputs_lattice_3d rename to Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged diff --git a/Examples/Tests/plasma_lens/PICMI_inputs_3d.py b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py similarity index 91% rename from Examples/Tests/plasma_lens/PICMI_inputs_3d.py rename to Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py index 50d222bbf36..99536dfb93f 100644 --- a/Examples/Tests/plasma_lens/PICMI_inputs_3d.py +++ b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py @@ -69,16 +69,12 @@ part_diag1 = picmi.ParticleDiagnostic(name = 'diag1', period = max_steps, species = [electrons], - data_list = ['ux', 'uy', 'uz', 'x', 'y', 'z'], - write_dir = '.', - warpx_file_prefix = 'Python_plasma_lens_plt') + data_list = ['ux', 'uy', 'uz', 'x', 'y', 'z']) field_diag1 = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = max_steps, - data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], - write_dir = '.', - warpx_file_prefix = 'Python_plasma_lens_plt') + data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz']) # Set up simulation sim = picmi.Simulation(solver = solver, max_steps = max_steps, diff --git a/Examples/Tests/plasma_lens/inputs_short_3d b/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short similarity index 100% rename from Examples/Tests/plasma_lens/inputs_short_3d rename to Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short diff --git a/Regression/Checksum/benchmarks_json/Python_LoadExternalGridField3D.json b/Regression/Checksum/benchmarks_json/load_external_field_3d_grid_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LoadExternalGridField3D.json rename to Regression/Checksum/benchmarks_json/load_external_field_3d_grid_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_LoadExternalParticleField3D.json b/Regression/Checksum/benchmarks_json/load_external_field_3d_particle_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LoadExternalParticleField3D.json rename to Regression/Checksum/benchmarks_json/load_external_field_3d_particle_picmi.json diff --git a/Regression/Checksum/benchmarks_json/LoadExternalFieldRZGrid.json b/Regression/Checksum/benchmarks_json/load_external_field_rz_grid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LoadExternalFieldRZGrid.json rename to Regression/Checksum/benchmarks_json/load_external_field_rz_grid.json diff --git a/Regression/Checksum/benchmarks_json/LoadExternalFieldRZParticles.json b/Regression/Checksum/benchmarks_json/load_external_field_rz_particles.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LoadExternalFieldRZParticles.json rename to Regression/Checksum/benchmarks_json/load_external_field_rz_particles.json diff --git a/Regression/Checksum/benchmarks_json/Python_magnetostatic_eb_3d.json b/Regression/Checksum/benchmarks_json/magnetostatic_eb_3d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_magnetostatic_eb_3d.json rename to Regression/Checksum/benchmarks_json/magnetostatic_eb_3d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_magnetostatic_eb_rz.json b/Regression/Checksum/benchmarks_json/magnetostatic_eb_rz_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_magnetostatic_eb_rz.json rename to Regression/Checksum/benchmarks_json/magnetostatic_eb_rz_picmi.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json b/Regression/Checksum/benchmarks_json/particles_in_pml_2d_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_2d_MR.json rename to Regression/Checksum/benchmarks_json/particles_in_pml_2d_mr.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml.json b/Regression/Checksum/benchmarks_json/particles_in_pml_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml.json rename to Regression/Checksum/benchmarks_json/particles_in_pml_3d.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json b/Regression/Checksum/benchmarks_json/particles_in_pml_3d_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_3d_MR.json rename to Regression/Checksum/benchmarks_json/particles_in_pml_3d_mr.json diff --git a/Regression/Checksum/benchmarks_json/PEC_field.json b/Regression/Checksum/benchmarks_json/pec_field.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PEC_field.json rename to Regression/Checksum/benchmarks_json/pec_field.json diff --git a/Regression/Checksum/benchmarks_json/PEC_field_mr.json b/Regression/Checksum/benchmarks_json/pec_field_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PEC_field_mr.json rename to Regression/Checksum/benchmarks_json/pec_field_mr.json diff --git a/Regression/Checksum/benchmarks_json/PEC_particle.json b/Regression/Checksum/benchmarks_json/pec_particle.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PEC_particle.json rename to Regression/Checksum/benchmarks_json/pec_particle.json diff --git a/Regression/Checksum/benchmarks_json/Plasma_lens.json b/Regression/Checksum/benchmarks_json/plasma_lens.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Plasma_lens.json rename to Regression/Checksum/benchmarks_json/plasma_lens.json diff --git a/Regression/Checksum/benchmarks_json/Plasma_lens_boosted.json b/Regression/Checksum/benchmarks_json/plasma_lens_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Plasma_lens_boosted.json rename to Regression/Checksum/benchmarks_json/plasma_lens_boosted.json diff --git a/Regression/Checksum/benchmarks_json/hard_edged_plasma_lens.json b/Regression/Checksum/benchmarks_json/plasma_lens_hard_edged.json similarity index 100% rename from Regression/Checksum/benchmarks_json/hard_edged_plasma_lens.json rename to Regression/Checksum/benchmarks_json/plasma_lens_hard_edged.json diff --git a/Regression/Checksum/benchmarks_json/Plasma_lens_short.json b/Regression/Checksum/benchmarks_json/plasma_lens_short.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Plasma_lens_short.json rename to Regression/Checksum/benchmarks_json/plasma_lens_short.json From c278299732a52a881717c83ce05eeb9a30dedde2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 14 Aug 2024 15:27:09 -0700 Subject: [PATCH 077/167] Separate Azure matrix element for EB tests --- .azure-pipelines.yml | 12 ++++--- Examples/CMakeLists.txt | 12 +++++++ .../capacitive_discharge/CMakeLists.txt | 3 ++ .../laser_acceleration/CMakeLists.txt | 1 + .../Tests/accelerator_lattice/CMakeLists.txt | 3 ++ Examples/Tests/boosted_diags/CMakeLists.txt | 1 + Examples/Tests/boundaries/CMakeLists.txt | 1 + Examples/Tests/btd_rz/CMakeLists.txt | 1 + .../collider_relevant_diags/CMakeLists.txt | 1 + Examples/Tests/collision/CMakeLists.txt | 6 ++++ Examples/Tests/divb_cleaning/CMakeLists.txt | 1 + Examples/Tests/dive_cleaning/CMakeLists.txt | 2 ++ .../electrostatic_dirichlet_bc/CMakeLists.txt | 2 ++ .../Tests/electrostatic_sphere/CMakeLists.txt | 5 +++ .../electrostatic_sphere_eb/CMakeLists.txt | 4 +++ .../embedded_boundary_cube/CMakeLists.txt | 3 ++ .../CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + .../CMakeLists.txt | 2 ++ Examples/Tests/embedded_circle/CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + Examples/Tests/flux_injection/CMakeLists.txt | 2 ++ Examples/Tests/gaussian_beam/CMakeLists.txt | 1 + Examples/Tests/implicit/CMakeLists.txt | 4 +++ .../Tests/initial_distribution/CMakeLists.txt | 1 + Examples/Tests/ion_stopping/CMakeLists.txt | 1 + Examples/Tests/ionization/CMakeLists.txt | 3 ++ Examples/Tests/langmuir/CMakeLists.txt | 35 +++++++++++++++++++ Examples/Tests/langmuir_fluids/CMakeLists.txt | 4 +++ Examples/Tests/larmor/CMakeLists.txt | 1 + Examples/Tests/laser_injection/CMakeLists.txt | 3 ++ .../laser_injection_from_file/CMakeLists.txt | 7 ++++ Examples/Tests/laser_on_fine/CMakeLists.txt | 1 + .../Tests/load_external_field/CMakeLists.txt | 4 +++ .../Tests/magnetostatic_eb/CMakeLists.txt | 3 ++ .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 1 + .../Tests/nci_fdtd_stability/CMakeLists.txt | 2 ++ .../Tests/nci_psatd_stability/CMakeLists.txt | 16 +++++++++ .../Tests/nodal_electrostatic/CMakeLists.txt | 1 + Examples/Tests/nuclear_fusion/CMakeLists.txt | 6 ++++ .../open_bc_poisson_solver/CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + .../particle_boundary_process/CMakeLists.txt | 2 ++ .../particle_boundary_scrape/CMakeLists.txt | 2 ++ .../Tests/particle_data_python/CMakeLists.txt | 3 ++ .../particle_fields_diags/CMakeLists.txt | 2 ++ Examples/Tests/particle_pusher/CMakeLists.txt | 1 + .../particle_thermal_boundary/CMakeLists.txt | 1 + .../Tests/particles_in_pml/CMakeLists.txt | 4 +++ .../pass_mpi_communicator/CMakeLists.txt | 1 + Examples/Tests/pec/CMakeLists.txt | 3 ++ Examples/Tests/photon_pusher/CMakeLists.txt | 1 + Examples/Tests/plasma_lens/CMakeLists.txt | 5 +++ Examples/Tests/single_particle/CMakeLists.txt | 1 + 54 files changed, 184 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0a3d96b1d1a..c9a8e3d15ac 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -28,16 +28,20 @@ jobs: matrix: # Cartesian 1D cartesian_1d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=1 -DWarpX_FFT=ON -DWarpX_PYTHON=ON # Cartesian 2D cartesian_2d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=2 -DWarpX_FFT=ON -DWarpX_PYTHON=ON # Cartesian 3D cartesian_3d: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON # Cylindrical RZ cylindrical_rz: - WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_EB=ON -DWarpX_PYTHON=ON + WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON + WARPX_RZ_FFT: 'TRUE' + # embedded boundaries + embedded_boundaries: + WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_EB=ON WARPX_RZ_FFT: 'TRUE' #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 86940457493..ce77a492554 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -21,6 +21,7 @@ function(add_warpx_test name dims nprocs + eb inputs analysis output @@ -36,6 +37,17 @@ function(add_warpx_test # return() #endif() + # cannot run EB tests w/o EB build + if(eb AND NOT WarpX_EB) + message(WARNING "cannot run EB tests without EB build") + return() + endif() + + # do not run no-EB tests w/ EB build + if(NOT eb AND WarpX_EB) + return() + endif() + # cannot run tests with unsupported geometry if(NOT dims IN_LIST WarpX_DIMS) return() diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 4ae4ce99813..80ea21665e3 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -5,6 +5,7 @@ add_warpx_test( background_mcc # name 2 # dims 2 # nprocs + OFF # eb Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output @@ -17,6 +18,7 @@ add_warpx_test( # background_mcc_dp_psp # name # 2 # dims # 2 # nprocs +# OFF # eb # Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output @@ -26,6 +28,7 @@ add_warpx_test( Python_background_mcc # name 2 # dims 2 # nprocs + OFF # eb Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 49fcb41acf9..7e614a9c52c 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -5,6 +5,7 @@ add_warpx_test( Python_LaserAcceleration_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index 882d28be076..790106de51b 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( hard_edged_quadrupoles # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -18,6 +19,7 @@ add_warpx_test( hard_edged_quadrupoles_boosted # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -29,6 +31,7 @@ add_warpx_test( hard_edged_quadrupoles_moving # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 903fb47a609..ed460d868da 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( laser_acceleration_btd # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index 9428865c315..e77467b3db8 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_boundaries_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index f401e065553..e9f4df222a5 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( BTD_rz # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/btd_rz/inputs_rz_test_BTD_rz # inputs Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis diags/diag1000289 # output diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index c620a4c69ee..d9438a224b9 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( collider_diagnostics # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index b2e7ad24a97..ae445f91211 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( collision_z # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/collision/inputs_1d_test_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output @@ -18,6 +19,7 @@ add_warpx_test( collision_iso # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/collision/inputs_3d_test_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output @@ -29,6 +31,7 @@ add_warpx_test( collision_rz # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/collision/inputs_rz_test_collision_rz # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output @@ -40,6 +43,7 @@ add_warpx_test( collision_xyz # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/collision/inputs_3d_test_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis collision_xyz_plt000150 # output @@ -51,6 +55,7 @@ add_warpx_test( collision_xz # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/collision/inputs_2d_test_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis collision_xz_plt000150 # output @@ -62,6 +67,7 @@ add_warpx_test( collision_xz_picmi # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis collision_xz_plt000150 # output diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 25bc90d7cfe..25a4a15b9eb 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( divb_cleaning_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 2f5db4a30fc..2710f58d383 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( dive_cleaning_2d # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output @@ -18,6 +19,7 @@ add_warpx_test( dive_cleaning_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 911659dc9c1..18cc451abbe 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( dirichlet_bc # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output @@ -18,6 +19,7 @@ add_warpx_test( dirichlet_bc_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 597e0b16aeb..4c065771eac 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( electrostatic_sphere # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -18,6 +19,7 @@ add_warpx_test( electrostatic_sphere_lab_frame # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -29,6 +31,7 @@ add_warpx_test( electrostatic_sphere_lab_frame_MR_emass_10 # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output @@ -40,6 +43,7 @@ add_warpx_test( electrostatic_sphere_rel_nodal # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -51,6 +55,7 @@ add_warpx_test( electrostatic_sphere_rz # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index d54e54b7d1c..c970edc2553 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( electrostatic_sphere_eb # name 3 # dims 2 # nprocs + ON # eb Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output @@ -18,6 +19,7 @@ add_warpx_test( electrostatic_sphere_eb_mixed_bc # name 3 # dims 2 # nprocs + ON # eb Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -29,6 +31,7 @@ add_warpx_test( electrostatic_sphere_eb_rz # name RZ # dims 2 # nprocs + ON # eb Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output @@ -40,6 +43,7 @@ add_warpx_test( electrostatic_sphere_eb_rz_mr # name RZ # dims 2 # nprocs + ON # eb Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 3a6c500fd48..c23591ecad8 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( embedded_boundary_cube_2d # name 2 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output @@ -18,6 +19,7 @@ add_warpx_test( embedded_boundary_cube_3d # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output @@ -29,6 +31,7 @@ add_warpx_test( embedded_boundary_cube_3d_macroscopic # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index 3758f964a89..07406bdc9c8 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( embedded_boundary_diffraction # name RZ # dims 2 # nprocs + ON # eb Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 0aa77d6e781..ed80e09217e 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( embedded_boundary_picmi # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 9f8f45ebb12..12db7eb2d0f 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( embedded_boundary_rotated_cube_2d # name 2 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 @@ -18,6 +19,7 @@ add_warpx_test( embedded_boundary_rotated_cube_3d # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index 6bf5c06b846..788c454766a 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( embedded_circle # name 2 # dims 2 # nprocs + ON # eb Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle # inputs Examples/Tests/embedded_circle/analysis.py # analysis diags/diag1000011 diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index aeb6771e193..492e5052c47 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( energy_conserving_thermal_plasma # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 3d0b477831c..f78e7406443 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( flux_injection_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output @@ -18,6 +19,7 @@ add_warpx_test( flux_injection_rz # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index a136a337f70..baded871751 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -5,6 +5,7 @@ add_warpx_test( Python_gaussian_beam # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 229e2d990a5..74c6c307160 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( semi_implicit_picard_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output @@ -18,6 +19,7 @@ add_warpx_test( theta_implicit_jfnk_vandb_2d # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output @@ -29,6 +31,7 @@ add_warpx_test( theta_implicit_jfnk_vandb_2d_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output @@ -40,6 +43,7 @@ add_warpx_test( theta_implicit_picard_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 22852cbb15b..f143ca10268 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( initial_distribution # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution # inputs Examples/Tests/initial_distribution/analysis_distribution.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index 46fd7683e39..d3e402e967b 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( ion_stopping # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping # inputs Examples/Tests/ion_stopping/analysis_ion_stopping.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index ed0f9562d3a..bd0c096f327 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( ionization_boost # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/ionization/inputs_2d_test_ionization_boost # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1000420 # output @@ -18,6 +19,7 @@ add_warpx_test( ionization_lab # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/ionization/inputs_2d_test_ionization_lab # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1001600 # output @@ -29,6 +31,7 @@ add_warpx_test( ionization_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py # inputs Examples/Tests/ionization/analysis_ionization.py # analysis diags/diag1001600 # output diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index ec65c56654c..0f40007a2d9 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( Langmuir_multi # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -18,6 +19,7 @@ add_warpx_test( Langmuir_multi_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output @@ -29,6 +31,7 @@ add_warpx_test( Langmuir_multi_2d_MR # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -40,6 +43,7 @@ add_warpx_test( Langmuir_multi_2d_MR_anisotropic # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -51,6 +55,7 @@ add_warpx_test( Langmuir_multi_2d_MR_momentum_conserving # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -63,6 +68,7 @@ if(WarpX_FFT) Langmuir_multi_2d_MR_psatd # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -75,6 +81,7 @@ add_warpx_test( Langmuir_multi_2d_nodal # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -86,6 +93,7 @@ add_warpx_test( Langmuir_multi_2d_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -98,6 +106,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -111,6 +120,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_current_correction # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -124,6 +134,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_current_correction_nodal # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -137,6 +148,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_momentum_conserving # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -150,6 +162,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_multiJ # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -163,6 +176,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_multiJ_nodal # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -176,6 +190,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_nodal # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -189,6 +204,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_Vay_deposition # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -203,6 +219,7 @@ endif() # Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name # 2 # dims # 1 # nprocs +# OFF # eb # Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output @@ -216,6 +233,7 @@ if(WarpX_FFT) Langmuir_multi_2d_psatd_Vay_deposition_nodal # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -228,6 +246,7 @@ add_warpx_test( Langmuir_multi_nodal # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -239,6 +258,7 @@ add_warpx_test( Langmuir_multi_picmi # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -251,6 +271,7 @@ if(WarpX_FFT) Langmuir_multi_psatd # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -264,6 +285,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_current_correction # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -277,6 +299,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_current_correction_nodal # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -290,6 +313,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_div_cleaning # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -303,6 +327,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_momentum_conserving # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -316,6 +341,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_multiJ # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -329,6 +355,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_multiJ_nodal # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -342,6 +369,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_nodal # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -355,6 +383,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_Vay_deposition # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -368,6 +397,7 @@ if(WarpX_FFT) Langmuir_multi_psatd_Vay_deposition_nodal # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -380,6 +410,7 @@ add_warpx_test( Langmuir_multi_rz # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -391,6 +422,7 @@ add_warpx_test( Langmuir_multi_rz_picmi # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -403,6 +435,7 @@ if(WarpX_FFT) Langmuir_multi_rz_psatd # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -416,6 +449,7 @@ if(WarpX_FFT) Langmuir_multi_rz_psatd_current_correction # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -429,6 +463,7 @@ if(WarpX_FFT) Langmuir_multi_rz_psatd_multiJ # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 3f6a1073344..5fc62e53018 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( Langmuir_fluid_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output @@ -18,6 +19,7 @@ add_warpx_test( Langmuir_fluid_2d # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output @@ -29,6 +31,7 @@ add_warpx_test( Langmuir_fluid_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output @@ -40,6 +43,7 @@ add_warpx_test( Langmuir_fluid_rz # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index 634c8b5b8ae..8c5fc70007b 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( Larmor # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/larmor/inputs_2d_test_Larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index 99f098c5caa..6879124e0d3 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( laser_injection_1d # name 1 # dims 2 # nprocs + OFF # eb Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output @@ -18,6 +19,7 @@ add_warpx_test( laser_injection_2d # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output @@ -29,6 +31,7 @@ add_warpx_test( laser_injection_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1001000 # output diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 68fd0516bd4..8c2fd895a05 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( laser_injection_from_binary_file # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis diags/diag1000250 # output @@ -18,6 +19,7 @@ add_warpx_test( laser_injection_from_lasy_file_1d # name 1 # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis diags/diag1000250 # output @@ -29,6 +31,7 @@ add_warpx_test( laser_injection_from_lasy_file_1d_boost # name 1 # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis diags/diag1000250 # output @@ -40,6 +43,7 @@ add_warpx_test( laser_injection_from_lasy_file_2d # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis diags/diag1000250 # output @@ -51,6 +55,7 @@ add_warpx_test( laser_injection_from_lasy_file_3d # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis diags/diag1000250 # output @@ -62,6 +67,7 @@ add_warpx_test( laser_injection_from_lasy_file_rz # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis diags/diag1000250 # output @@ -73,6 +79,7 @@ add_warpx_test( laser_injection_from_rz_lasy_file # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis diags/diag1000250 # output diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index 8aa2197b3e4..1b20867fb31 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( laser_on_fine # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index ab126ec9b41..3c67854ee4f 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( load_external_field_3d_grid_picmi # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output @@ -18,6 +19,7 @@ add_warpx_test( load_external_field_3d_particle_picmi # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output @@ -30,6 +32,7 @@ add_warpx_test( # load_external_field_rz_grid # name # RZ # dims # 1 # nprocs +# OFF # eb # Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid # inputs # Examples/Tests/load_external_field/analysis_rz.py # analysis # diags/diag1000300 # output @@ -42,6 +45,7 @@ add_warpx_test( # load_external_field_rz_particle # name # RZ # dims # 1 # nprocs +# OFF # eb # Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle # inputs # Examples/Tests/load_external_field/analysis_rz.py # analysis # diags/diag1000300 # output diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index de8c12c783d..94c2b324976 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( magnetostatic_eb_3d # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -18,6 +19,7 @@ add_warpx_test( magnetostatic_eb_3d_picmi # name 3 # dims 1 # nprocs + ON # eb Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -29,6 +31,7 @@ add_warpx_test( magnetostatic_eb_rz_picmi # name RZ # dims 1 # nprocs + ON # eb Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py # inputs Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index 1da13bfcce0..e09159c07e7 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -8,6 +8,7 @@ if(WarpX_FFT) maxwell_hybrid_qed_solver # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver # inputs Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index fbdcc38a2c7..05be97853df 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( nci_corrector # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output @@ -18,6 +19,7 @@ add_warpx_test( nci_corrector_mr # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index c30ec891cfa..266afb5ca3f 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -8,6 +8,7 @@ if(WarpX_FFT) averaged_galilean_2d_psatd # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -21,6 +22,7 @@ if(WarpX_FFT) averaged_galilean_2d_psatd_hybrid # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -34,6 +36,7 @@ if(WarpX_FFT) averaged_galilean_3d_psatd # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -47,6 +50,7 @@ if(WarpX_FFT) averaged_galilean_3d_psatd_hybrid # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -60,6 +64,7 @@ if(WarpX_FFT) comoving_2d_psatd_hybrid # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -73,6 +78,7 @@ if(WarpX_FFT) galilean_2d_psatd # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -86,6 +92,7 @@ if(WarpX_FFT) galilean_2d_psatd_current_correction # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -99,6 +106,7 @@ if(WarpX_FFT) galilean_2d_psatd_current_correction_psb # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -112,6 +120,7 @@ if(WarpX_FFT) galilean_2d_psatd_hybrid # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -125,6 +134,7 @@ if(WarpX_FFT) galilean_3d_psatd # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -138,6 +148,7 @@ if(WarpX_FFT) galilean_3d_psatd_current_correction # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -151,6 +162,7 @@ if(WarpX_FFT) galilean_3d_psatd_current_correction_psb # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -164,6 +176,7 @@ if(WarpX_FFT) galilean_rz_psatd # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -177,6 +190,7 @@ if(WarpX_FFT) galilean_rz_psatd_current_correction # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -190,6 +204,7 @@ if(WarpX_FFT) galilean_rz_psatd_current_correction_psb # name RZ # dims 1 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -203,6 +218,7 @@ if(WarpX_FFT) multi_J_rz_psatd # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 9146934c8bb..924661033a9 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( nodal_electrostatic_solver # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver # inputs Examples/Tests/nodal_electrostatic/analysis_3d.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 8b562fe3c5a..eeba090239d 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( Deuterium_Deuterium_Fusion_3D # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -18,6 +19,7 @@ add_warpx_test( Deuterium_Deuterium_Fusion_3D_intraspecies # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output @@ -29,6 +31,7 @@ add_warpx_test( Deuterium_Tritium_Fusion_3D # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -40,6 +43,7 @@ add_warpx_test( Deuterium_Tritium_Fusion_RZ # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -51,6 +55,7 @@ add_warpx_test( Proton_Boron_Fusion_2D # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output @@ -62,6 +67,7 @@ add_warpx_test( Proton_Boron_Fusion_3D # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index 4fdf943b357..8b70cf98fe0 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -8,6 +8,7 @@ if(WarpX_FFT) open_bc_poisson_solver # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index f136168d224..9b42503ed16 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_boundary_interaction # name RZ # dims 2 # nprocs + OFF # eb Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis diags/diag1000023 # output diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index 4ff4733b07f..b59e26b80a2 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_absorption # name 3 # dims 2 # nprocs + ON # eb Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption # inputs Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis diags/diag1000060 # output @@ -18,6 +19,7 @@ add_warpx_test( particle_reflection_picmi # name 2 # dims 1 # nprocs + OFF # eb Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py # inputs Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index d038702f9c0..666a5f093f7 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_scrape # name 3 # dims 2 # nprocs + ON # eb Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output @@ -18,6 +19,7 @@ add_warpx_test( particle_scrape_picmi # name 3 # dims 2 # nprocs + ON # eb Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index 2068c6f6748..f9009dfb524 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( prev_positions_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -18,6 +19,7 @@ add_warpx_test( particle_attr_access_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs Examples/Tests/particle_data_python/analysis.py # analysis diags/diag1000010 # output @@ -30,6 +32,7 @@ add_warpx_test( # particle_attr_access_unique_picmi # name # 2 # dims # 2 # nprocs +# OFF # eb # Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs # Examples/Tests/particle_data_python/analysis.py # analysis # diags/diag1000010 # output diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 8c9697187a0..0c7bdf77d0d 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_fields_diags # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags # inputs Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis diags/diag1000200 # output @@ -19,6 +20,7 @@ add_warpx_test( # particle_fields_diags_single_precision # name # 3 # dims # 2 # nprocs +# OFF # eb # Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags_single_precision # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index 0d4fb95c6b8..570f7b6563a 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_pusher # name 3 # dims 1 # nprocs + OFF # eb Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher # inputs Examples/Tests/particle_pusher/analysis_pusher.py # analysis diags/diag1010000 # output diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index 5bd649d90c6..c3e58bf04d4 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particle_thermal_boundary # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary # inputs Examples/Tests/particle_thermal_boundary/analysis_2d.py # analysis diags/diag1002000 # output diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index 898e037de2d..9deb14e5d7e 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( particles_in_pml_2d # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000180 # output @@ -18,6 +19,7 @@ add_warpx_test( particles_in_pml_2d_mr # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000300 # output @@ -29,6 +31,7 @@ add_warpx_test( particles_in_pml_3d # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000120 # output @@ -40,6 +43,7 @@ add_warpx_test( particles_in_pml_3d_mr # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000200 # output diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index ba55cd3acf4..671c9714002 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( pass_mpi_comm_picmi # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py # inputs Examples/Tests/pass_mpi_communicator/analysis.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index d388e0896d0..5a6064ff935 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( pec_field # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/pec/inputs_3d_test_pec_field # inputs Examples/Tests/pec/analysis_pec.py # analysis diags/diag1000125 # output @@ -18,6 +19,7 @@ add_warpx_test( pec_field_mr # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/pec/inputs_3d_test_pec_field_mr # inputs Examples/Tests/pec/analysis_pec_mr.py # analysis diags/diag1000125 # output @@ -29,6 +31,7 @@ add_warpx_test( pec_particle # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/pec/inputs_3d_test_pec_particle # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index 27015aceac2..0557ca94865 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( photon_pusher # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher # inputs Examples/Tests/photon_pusher/analysis_photon_pusher.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index 32df47ea033..d5c470df371 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( plasma_lens # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -18,6 +19,7 @@ add_warpx_test( plasma_lens_boosted # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -29,6 +31,7 @@ add_warpx_test( plasma_lens_hard_edged # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -40,6 +43,7 @@ add_warpx_test( plasma_lens_picmi # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -51,6 +55,7 @@ add_warpx_test( plasma_lens_short # name 3 # dims 2 # nprocs + OFF # eb Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index d6c8b4986a1..0efae743174 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( bilinear_filter # name 2 # dims 2 # nprocs + OFF # eb Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis diags/diag1000001 # output From ca9ec12109976a5f07422bf84e1d397a203b2207 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 14 Aug 2024 16:42:42 -0700 Subject: [PATCH 078/167] Cleanup --- .../capacitive_discharge/CMakeLists.txt | 6 +- ...=> inputs_2d_test_background_mcc_picmi.py} | 0 .../laser_acceleration/CMakeLists.txt | 6 +- ...ts_1d_test_laser_acceleration_1d_picmi.py} | 0 Examples/Tests/btd_rz/CMakeLists.txt | 8 +- ...tenna.py => analysis_btd_laser_antenna.py} | 0 ...s_rz_test_BTD_rz => inputs_rz_test_btd_rz} | 0 .../Tests/electrostatic_sphere/CMakeLists.txt | 6 +- ...lectrostatic_sphere_lab_frame_mr_emass_10} | 0 Examples/Tests/gaussian_beam/CMakeLists.txt | 6 +- ... => inputs_2d_test_gaussian_beam_picmi.py} | 0 Examples/Tests/langmuir/CMakeLists.txt | 228 +++++++++--------- ...ti_1d => inputs_1d_test_langmuir_multi_1d} | 0 ...MR => inputs_2d_test_langmuir_multi_2d_mr} | 0 ..._2d_test_langmuir_multi_2d_mr_anisotropic} | 0 ..._langmuir_multi_2d_mr_momentum_conserving} | 0 ...inputs_2d_test_langmuir_multi_2d_mr_psatd} | 0 ...=> inputs_2d_test_langmuir_multi_2d_nodal} | 0 ...inputs_2d_test_langmuir_multi_2d_picmi.py} | 0 ...=> inputs_2d_test_langmuir_multi_2d_psatd} | 0 ...angmuir_multi_2d_psatd_current_correction} | 0 ...r_multi_2d_psatd_current_correction_nodal} | 0 ...ngmuir_multi_2d_psatd_momentum_conserving} | 0 ...ts_2d_test_langmuir_multi_2d_psatd_multiJ} | 0 ...test_langmuir_multi_2d_psatd_multiJ_nodal} | 0 ...uts_2d_test_langmuir_multi_2d_psatd_nodal} | 0 ...st_langmuir_multi_2d_psatd_vay_deposition} | 0 ...gmuir_multi_2d_psatd_vay_deposition_nodal} | 0 ..._2d_psatd_vay_deposition_particle_shape_4} | 0 ...multi => inputs_3d_test_langmuir_multi_3d} | 0 ...=> inputs_3d_test_langmuir_multi_3d_nodal} | 0 ...inputs_3d_test_langmuir_multi_3d_picmi.py} | 0 ...=> inputs_3d_test_langmuir_multi_3d_psatd} | 0 ...angmuir_multi_3d_psatd_current_correction} | 0 ...r_multi_3d_psatd_current_correction_nodal} | 0 ...test_langmuir_multi_3d_psatd_div_cleaning} | 0 ...ngmuir_multi_3d_psatd_momentum_conserving} | 0 ...ts_3d_test_langmuir_multi_3d_psatd_multiJ} | 0 ...test_langmuir_multi_3d_psatd_multiJ_nodal} | 0 ...uts_3d_test_langmuir_multi_3d_psatd_nodal} | 0 ...st_langmuir_multi_3d_psatd_vay_deposition} | 0 ...gmuir_multi_3d_psatd_vay_deposition_nodal} | 0 ...ti_rz => inputs_rz_test_langmuir_multi_rz} | 0 ...inputs_rz_test_langmuir_multi_rz_picmi.py} | 0 ...=> inputs_rz_test_langmuir_multi_rz_psatd} | 0 ...angmuir_multi_rz_psatd_current_correction} | 0 ...ts_rz_test_langmuir_multi_rz_psatd_multiJ} | 0 Examples/Tests/langmuir_fluids/CMakeLists.txt | 24 +- ...id_1d => inputs_1d_test_langmuir_fluid_1d} | 0 ...id_2d => inputs_2d_test_langmuir_fluid_2d} | 0 ...id_3d => inputs_3d_test_langmuir_fluid_3d} | 0 ...id_rz => inputs_rz_test_langmuir_fluid_rz} | 0 Examples/Tests/larmor/CMakeLists.txt | 6 +- ...s_2d_test_Larmor => inputs_2d_test_larmor} | 0 Examples/Tests/nuclear_fusion/CMakeLists.txt | 36 +-- ... => inputs_2d_test_proton_boron_fusion_2d} | 0 ...uts_3d_test_deuterium_deuterium_fusion_3d} | 0 ...euterium_deuterium_fusion_3d_intraspecies} | 0 ...nputs_3d_test_deuterium_tritium_fusion_3d} | 0 ... => inputs_3d_test_proton_boron_fusion_3d} | 0 ...nputs_rz_test_deuterium_tritium_fusion_rz} | 0 .../{BTD_rz.json => btd_rz.json} | 0 ...son => deuterium_deuterium_fusion_3d.json} | 0 ...ium_deuterium_fusion_3d_intraspecies.json} | 0 ....json => deuterium_tritium_fusion_3d.json} | 0 ....json => deuterium_tritium_fusion_rz.json} | 0 ...ostatic_sphere_lab_frame_mr_emass_10.json} | 0 ...r_fluid_1d.json => langmuir_fluid_1d.json} | 0 ...r_fluid_2d.json => langmuir_fluid_2d.json} | 0 ...r_fluid_3d.json => langmuir_fluid_3d.json} | 0 ...r_fluid_rz.json => langmuir_fluid_rz.json} | 0 ...r_multi_1d.json => langmuir_multi_1d.json} | 0 ...i_2d_MR.json => langmuir_multi_2d_mr.json} | 0 ... => langmuir_multi_2d_mr_anisotropic.json} | 0 ...muir_multi_2d_mr_momentum_conserving.json} | 0 ...d.json => langmuir_multi_2d_mr_psatd.json} | 0 ...odal.json => langmuir_multi_2d_nodal.json} | 0 ...icmi.json => langmuir_multi_2d_picmi.json} | 0 ...satd.json => langmuir_multi_2d_psatd.json} | 0 ...ir_multi_2d_psatd_current_correction.json} | 0 ...ti_2d_psatd_current_correction_nodal.json} | 0 ...r_multi_2d_psatd_momentum_conserving.json} | 0 ...on => langmuir_multi_2d_psatd_multiJ.json} | 0 ...langmuir_multi_2d_psatd_multiJ_nodal.json} | 0 ...son => langmuir_multi_2d_psatd_nodal.json} | 0 ...ngmuir_multi_2d_psatd_vay_deposition.json} | 0 ..._multi_2d_psatd_vay_deposition_nodal.json} | 0 ...satd_vay_deposition_particle_shape_4.json} | 0 ...muir_multi.json => langmuir_multi_3d.json} | 0 ...odal.json => langmuir_multi_3d_nodal.json} | 0 ...icmi.json => langmuir_multi_3d_picmi.json} | 0 ...satd.json => langmuir_multi_3d_psatd.json} | 0 ...ir_multi_3d_psatd_current_correction.json} | 0 ...ti_3d_psatd_current_correction_nodal.json} | 0 ...langmuir_multi_3d_psatd_div_cleaning.json} | 0 ...r_multi_3d_psatd_momentum_conserving.json} | 0 ...on => langmuir_multi_3d_psatd_multiJ.json} | 0 ...langmuir_multi_3d_psatd_multiJ_nodal.json} | 0 ...son => langmuir_multi_3d_psatd_nodal.json} | 0 ...muir_multi_3d_psatd_single_precision.json} | 0 ...ngmuir_multi_3d_psatd_vay_deposition.json} | 0 ..._multi_3d_psatd_vay_deposition_nodal.json} | 0 ...> langmuir_multi_3d_single_precision.json} | 0 ...r_multi_rz.json => langmuir_multi_rz.json} | 0 ...icmi.json => langmuir_multi_rz_picmi.json} | 0 ...satd.json => langmuir_multi_rz_psatd.json} | 0 ...ir_multi_rz_psatd_current_correction.json} | 0 ...on => langmuir_multi_rz_psatd_multiJ.json} | 0 .../{Larmor.json => larmor.json} | 0 ....json => laser_acceleration_1d_picmi.json} | 0 110 files changed, 166 insertions(+), 160 deletions(-) rename Examples/Physics_applications/capacitive_discharge/{PICMI_inputs_2d.py => inputs_2d_test_background_mcc_picmi.py} (100%) rename Examples/Physics_applications/laser_acceleration/{PICMI_inputs_1d.py => inputs_1d_test_laser_acceleration_1d_picmi.py} (100%) rename Examples/Tests/btd_rz/{analysis_BTD_laser_antenna.py => analysis_btd_laser_antenna.py} (100%) rename Examples/Tests/btd_rz/{inputs_rz_test_BTD_rz => inputs_rz_test_btd_rz} (100%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 => inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10} (100%) rename Examples/Tests/gaussian_beam/{PICMI_inputs_gaussian_beam.py => inputs_2d_test_gaussian_beam_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_1d_test_Langmuir_multi_1d => inputs_1d_test_langmuir_multi_1d} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR => inputs_2d_test_langmuir_multi_2d_mr} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_anisotropic => inputs_2d_test_langmuir_multi_2d_mr_anisotropic} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving => inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_MR_psatd => inputs_2d_test_langmuir_multi_2d_mr_psatd} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_nodal => inputs_2d_test_langmuir_multi_2d_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_picmi.py => inputs_2d_test_langmuir_multi_2d_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd => inputs_2d_test_langmuir_multi_2d_psatd} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_current_correction => inputs_2d_test_langmuir_multi_2d_psatd_current_correction} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal => inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving => inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_multiJ => inputs_2d_test_langmuir_multi_2d_psatd_multiJ} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal => inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_nodal => inputs_2d_test_langmuir_multi_2d_psatd_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition => inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal => inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 => inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi => inputs_3d_test_langmuir_multi_3d} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_nodal => inputs_3d_test_langmuir_multi_3d_nodal} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_picmi.py => inputs_3d_test_langmuir_multi_3d_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd => inputs_3d_test_langmuir_multi_3d_psatd} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_current_correction => inputs_3d_test_langmuir_multi_3d_psatd_current_correction} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal => inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_div_cleaning => inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_momentum_conserving => inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_multiJ => inputs_3d_test_langmuir_multi_3d_psatd_multiJ} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal => inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_nodal => inputs_3d_test_langmuir_multi_3d_psatd_nodal} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_Vay_deposition => inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal => inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_Langmuir_multi_rz => inputs_rz_test_langmuir_multi_rz} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_Langmuir_multi_rz_picmi.py => inputs_rz_test_langmuir_multi_rz_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_Langmuir_multi_rz_psatd => inputs_rz_test_langmuir_multi_rz_psatd} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_Langmuir_multi_rz_psatd_current_correction => inputs_rz_test_langmuir_multi_rz_psatd_current_correction} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_Langmuir_multi_rz_psatd_multiJ => inputs_rz_test_langmuir_multi_rz_psatd_multiJ} (100%) rename Examples/Tests/langmuir_fluids/{inputs_1d_test_Langmuir_fluid_1d => inputs_1d_test_langmuir_fluid_1d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_2d_test_Langmuir_fluid_2d => inputs_2d_test_langmuir_fluid_2d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_3d_test_Langmuir_fluid_3d => inputs_3d_test_langmuir_fluid_3d} (100%) rename Examples/Tests/langmuir_fluids/{inputs_rz_test_Langmuir_fluid_rz => inputs_rz_test_langmuir_fluid_rz} (100%) rename Examples/Tests/larmor/{inputs_2d_test_Larmor => inputs_2d_test_larmor} (100%) rename Examples/Tests/nuclear_fusion/{inputs_2d_test_Proton_Boron_Fusion_2D => inputs_2d_test_proton_boron_fusion_2d} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_Deuterium_Deuterium_Fusion_3D => inputs_3d_test_deuterium_deuterium_fusion_3d} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies => inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_Deuterium_Tritium_Fusion_3D => inputs_3d_test_deuterium_tritium_fusion_3d} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_Proton_Boron_Fusion_3D => inputs_3d_test_proton_boron_fusion_3d} (100%) rename Examples/Tests/nuclear_fusion/{inputs_rz_test_Deuterium_Tritium_Fusion_RZ => inputs_rz_test_deuterium_tritium_fusion_rz} (100%) rename Regression/Checksum/benchmarks_json/{BTD_rz.json => btd_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Deuterium_Deuterium_Fusion_3D.json => deuterium_deuterium_fusion_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Deuterium_Deuterium_Fusion_3D_intraspecies.json => deuterium_deuterium_fusion_3d_intraspecies.json} (100%) rename Regression/Checksum/benchmarks_json/{Deuterium_Tritium_Fusion_3D.json => deuterium_tritium_fusion_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Deuterium_Tritium_Fusion_RZ.json => deuterium_tritium_fusion_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_lab_frame_MR_emass_10.json => electrostatic_sphere_lab_frame_mr_emass_10.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_1d.json => langmuir_fluid_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_2d.json => langmuir_fluid_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_3d.json => langmuir_fluid_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_fluid_rz.json => langmuir_fluid_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_1d.json => langmuir_multi_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_MR.json => langmuir_multi_2d_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_MR_anisotropic.json => langmuir_multi_2d_mr_anisotropic.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_MR_momentum_conserving.json => langmuir_multi_2d_mr_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_MR_psatd.json => langmuir_multi_2d_mr_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_nodal.json => langmuir_multi_2d_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_picmi.json => langmuir_multi_2d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd.json => langmuir_multi_2d_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_current_correction.json => langmuir_multi_2d_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_current_correction_nodal.json => langmuir_multi_2d_psatd_current_correction_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_momentum_conserving.json => langmuir_multi_2d_psatd_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_multiJ.json => langmuir_multi_2d_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_multiJ_nodal.json => langmuir_multi_2d_psatd_multiJ_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_nodal.json => langmuir_multi_2d_psatd_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_Vay_deposition.json => langmuir_multi_2d_psatd_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_Vay_deposition_nodal.json => langmuir_multi_2d_psatd_vay_deposition_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4.json => langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi.json => langmuir_multi_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_nodal.json => langmuir_multi_3d_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_picmi.json => langmuir_multi_3d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd.json => langmuir_multi_3d_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_current_correction.json => langmuir_multi_3d_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_current_correction_nodal.json => langmuir_multi_3d_psatd_current_correction_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_div_cleaning.json => langmuir_multi_3d_psatd_div_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_momentum_conserving.json => langmuir_multi_3d_psatd_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_multiJ.json => langmuir_multi_3d_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_multiJ_nodal.json => langmuir_multi_3d_psatd_multiJ_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_nodal.json => langmuir_multi_3d_psatd_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_single_precision.json => langmuir_multi_3d_psatd_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_Vay_deposition.json => langmuir_multi_3d_psatd_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_psatd_Vay_deposition_nodal.json => langmuir_multi_3d_psatd_vay_deposition_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_single_precision.json => langmuir_multi_3d_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_rz.json => langmuir_multi_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_rz_picmi.json => langmuir_multi_rz_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_rz_psatd.json => langmuir_multi_rz_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_rz_psatd_current_correction.json => langmuir_multi_rz_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{Langmuir_multi_rz_psatd_multiJ.json => langmuir_multi_rz_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{Larmor.json => larmor.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LaserAcceleration_1d.json => laser_acceleration_1d_picmi.json} (100%) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 80ea21665e3..d6deedb6890 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -24,12 +24,14 @@ add_warpx_test( # diags/diag1000050 # output #) +# background_mcc_picmi ######################################################## +# add_warpx_test( - Python_background_mcc # name + background_mcc_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py # inputs + Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output ) diff --git a/Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py similarity index 100% rename from Examples/Physics_applications/capacitive_discharge/PICMI_inputs_2d.py rename to Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 7e614a9c52c..181cc74bab9 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -1,12 +1,14 @@ # Add tests (alphabetical order) ############################################## # +# laser_acceleration_1d_picmi ################################################# +# add_warpx_test( - Python_LaserAcceleration_1d # name + laser_acceleration_1d_picmi # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py # inputs + Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) diff --git a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py b/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/PICMI_inputs_1d.py rename to Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index e9f4df222a5..56b27155876 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -1,14 +1,14 @@ # Add tests (alphabetical order) ############################################## # -# BTD_rz ###################################################################### +# btd_rz ###################################################################### # add_warpx_test( - BTD_rz # name + btd_rz # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/btd_rz/inputs_rz_test_BTD_rz # inputs - Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py # analysis + Examples/Tests/btd_rz/inputs_rz_test_btd_rz # inputs + Examples/Tests/btd_rz/analysis_btd_laser_antenna.py # analysis diags/diag1000289 # output ) diff --git a/Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py b/Examples/Tests/btd_rz/analysis_btd_laser_antenna.py similarity index 100% rename from Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py rename to Examples/Tests/btd_rz/analysis_btd_laser_antenna.py diff --git a/Examples/Tests/btd_rz/inputs_rz_test_BTD_rz b/Examples/Tests/btd_rz/inputs_rz_test_btd_rz similarity index 100% rename from Examples/Tests/btd_rz/inputs_rz_test_BTD_rz rename to Examples/Tests/btd_rz/inputs_rz_test_btd_rz diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 4c065771eac..30708d51874 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -25,14 +25,14 @@ add_warpx_test( diags/diag1000030 # output ) -# electrostatic_sphere_lab_frame_MR_emass_10 ################################## +# electrostatic_sphere_lab_frame_mr_emass_10 ################################## # add_warpx_test( - electrostatic_sphere_lab_frame_MR_emass_10 # name + electrostatic_sphere_lab_frame_mr_emass_10 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 # inputs + Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output ) diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 b/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 similarity index 100% rename from Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_MR_emass_10 rename to Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index baded871751..e2f4ab6e703 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -1,12 +1,14 @@ # Add tests (alphabetical order) ############################################## # +# gaussian_beam_picmi ######################################################### +# add_warpx_test( - Python_gaussian_beam # name + gaussian_beam_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py # inputs + Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py b/Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py similarity index 100% rename from Examples/Tests/gaussian_beam/PICMI_inputs_gaussian_beam.py rename to Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 0f40007a2d9..f70ec0b2353 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -1,470 +1,470 @@ # Add tests (alphabetical order) ############################################## # -# Langmuir_multi ############################################################## +# langmuir_multi_1d ########################################################### # add_warpx_test( - Langmuir_multi # name - 3 # dims - 2 # nprocs - OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis - diags/diag1000040 # output -) - -# Langmuir_multi_1d ########################################################### -# -add_warpx_test( - Langmuir_multi_1d # name + langmuir_multi_1d # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d # inputs + Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_2d_MR ######################################################## +# langmuir_multi_2d_mr ######################################################## # add_warpx_test( - Langmuir_multi_2d_MR # name + langmuir_multi_2d_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_2d_MR_anisotropic ############################################ +# langmuir_multi_2d_mr_anisotropic ############################################ # add_warpx_test( - Langmuir_multi_2d_MR_anisotropic # name + langmuir_multi_2d_mr_anisotropic # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_2d_MR_momentum_conserving #################################### +# langmuir_multi_2d_mr_momentum_conserving #################################### # add_warpx_test( - Langmuir_multi_2d_MR_momentum_conserving # name + langmuir_multi_2d_mr_momentum_conserving # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_2d_MR_psatd ################################################## +# langmuir_multi_2d_mr_psatd ################################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_MR_psatd # name + langmuir_multi_2d_mr_psatd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_nodal ##################################################### +# langmuir_multi_2d_nodal ##################################################### # add_warpx_test( - Langmuir_multi_2d_nodal # name + langmuir_multi_2d_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_2d_picmi ##################################################### +# langmuir_multi_2d_picmi ##################################################### # add_warpx_test( - Langmuir_multi_2d_picmi # name + langmuir_multi_2d_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# Langmuir_multi_2d_psatd ##################################################### +# langmuir_multi_2d_psatd ##################################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd # name + langmuir_multi_2d_psatd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_current_correction ################################## +# langmuir_multi_2d_psatd_current_correction ################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_current_correction # name + langmuir_multi_2d_psatd_current_correction # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_current_correction_nodal ############################ +# langmuir_multi_2d_psatd_current_correction_nodal ############################ # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_current_correction_nodal # name + langmuir_multi_2d_psatd_current_correction_nodal # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_momentum_conserving ################################# +# langmuir_multi_2d_psatd_momentum_conserving ################################# # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_momentum_conserving # name + langmuir_multi_2d_psatd_momentum_conserving # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_multiJ ############################################## +# langmuir_multi_2d_psatd_multiJ ############################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_multiJ # name + langmuir_multi_2d_psatd_multiJ # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_multiJ_nodal ######################################## +# langmuir_multi_2d_psatd_multiJ_nodal ######################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_multiJ_nodal # name + langmuir_multi_2d_psatd_multiJ_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_nodal ############################################### +# langmuir_multi_2d_psatd_nodal ############################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_nodal # name + langmuir_multi_2d_psatd_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_2d_psatd_Vay_deposition ###################################### +# langmuir_multi_2d_psatd_vay_deposition ###################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_Vay_deposition # name + langmuir_multi_2d_psatd_vay_deposition # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() # FIXME -# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 ##################### +# langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 ##################### # #if(WarpX_FFT) # add_warpx_test( -# Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # name +# langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 # name # 2 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 # inputs +# Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output # ) #endif() -# Langmuir_multi_2d_psatd_Vay_deposition_nodal ################################ +# langmuir_multi_2d_psatd_vay_deposition_nodal ################################ # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_2d_psatd_Vay_deposition_nodal # name + langmuir_multi_2d_psatd_vay_deposition_nodal # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal # inputs + Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_nodal ######################################################## +# langmuir_multi_3d ########################################################### +# +add_warpx_test( + langmuir_multi_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d # inputs + Examples/Tests/langmuir/analysis_3d.py # analysis + diags/diag1000040 # output +) + +# langmuir_multi_3d_nodal ##################################################### # add_warpx_test( - Langmuir_multi_nodal # name + langmuir_multi_3d_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) -# Langmuir_multi_picmi ######################################################## +# langmuir_multi_3d_picmi ##################################################### # add_warpx_test( - Langmuir_multi_picmi # name + langmuir_multi_3d_picmi # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# Langmuir_multi_psatd ######################################################## +# langmuir_multi_3d_psatd ##################################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd # name + langmuir_multi_3d_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_current_correction ##################################### +# langmuir_multi_3d_psatd_current_correction ################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_current_correction # name + langmuir_multi_3d_psatd_current_correction # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_current_correction_nodal ############################### +# langmuir_multi_3d_psatd_current_correction_nodal ############################ # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_current_correction_nodal # name + langmuir_multi_3d_psatd_current_correction_nodal # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_div_cleaning ########################################### +# langmuir_multi_3d_psatd_div_cleaning ######################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_div_cleaning # name + langmuir_multi_3d_psatd_div_cleaning # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_momentum_conserving #################################### +# langmuir_multi_3d_psatd_momentum_conserving ################################# # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_momentum_conserving # name + langmuir_multi_3d_psatd_momentum_conserving # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_multiJ ################################################# +# langmuir_multi_3d_psatd_multiJ ############################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_multiJ # name + langmuir_multi_3d_psatd_multiJ # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_multiJ_nodal ########################################### +# langmuir_multi_3d_psatd_multiJ_nodal ######################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_multiJ_nodal # name + langmuir_multi_3d_psatd_multiJ_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_nodal ################################################## +# langmuir_multi_3d_psatd_nodal ############################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_nodal # name + langmuir_multi_3d_psatd_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_Vay_deposition ######################################### +# langmuir_multi_3d_psatd_vay_deposition ###################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_Vay_deposition # name + langmuir_multi_3d_psatd_vay_deposition # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_psatd_Vay_deposition_nodal ################################### +# langmuir_multi_3d_psatd_vay_deposition_nodal ################################ # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_psatd_Vay_deposition_nodal # name + langmuir_multi_3d_psatd_vay_deposition_nodal # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal # inputs + Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# Langmuir_multi_rz ########################################################### +# langmuir_multi_rz ########################################################### # add_warpx_test( - Langmuir_multi_rz # name + langmuir_multi_rz # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz # inputs + Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) -# Langmuir_multi_rz_picmi ##################################################### +# langmuir_multi_rz_picmi ##################################################### # add_warpx_test( - Langmuir_multi_rz_picmi # name + langmuir_multi_rz_picmi # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py # inputs + Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# Langmuir_multi_rz_psatd ##################################################### +# langmuir_multi_rz_psatd ##################################################### # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_rz_psatd # name + langmuir_multi_rz_psatd # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd # inputs + Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_rz_psatd_current_correction ################################## +# langmuir_multi_rz_psatd_current_correction ################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_rz_psatd_current_correction # name + langmuir_multi_rz_psatd_current_correction # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) endif() -# Langmuir_multi_rz_psatd_multiJ ############################################## +# langmuir_multi_rz_psatd_multiJ ############################################## # if(WarpX_FFT) add_warpx_test( - Langmuir_multi_rz_psatd_multiJ # name + langmuir_multi_rz_psatd_multiJ # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d b/Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d similarity index 100% rename from Examples/Tests/langmuir/inputs_1d_test_Langmuir_multi_1d rename to Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_anisotropic rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_momentum_conserving rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_MR_psatd rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_nodal rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_picmi.py rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_current_correction_nodal rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_momentum_conserving rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_multiJ_nodal rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_nodal rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_nodal rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal diff --git a/Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 b/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4 rename to Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_nodal rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_picmi.py rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_current_correction_nodal rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_div_cleaning rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_momentum_conserving rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_multiJ_nodal rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_nodal rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition diff --git a/Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_Langmuir_multi_psatd_Vay_deposition_nodal rename to Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz b/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz rename to Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py b/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_picmi.py rename to Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd b/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd rename to Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction b/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_current_correction rename to Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction diff --git a/Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ b/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_Langmuir_multi_rz_psatd_multiJ rename to Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 5fc62e53018..ecafa6d795d 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -1,50 +1,50 @@ # Add tests (alphabetical order) ############################################## # -# Langmuir_fluid_1d ########################################################### +# langmuir_fluid_1d ########################################################### # add_warpx_test( - Langmuir_fluid_1d # name + langmuir_fluid_1d # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d # inputs + Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output ) -# Langmuir_fluid_2d ########################################################### +# langmuir_fluid_2d ########################################################### # add_warpx_test( - Langmuir_fluid_2d # name + langmuir_fluid_2d # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d # inputs + Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output ) -# Langmuir_fluid_3d ########################################################### +# langmuir_fluid_3d ########################################################### # add_warpx_test( - Langmuir_fluid_3d # name + langmuir_fluid_3d # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d # inputs + Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output ) -# Langmuir_fluid_rz ########################################################### +# langmuir_fluid_rz ########################################################### # add_warpx_test( - Langmuir_fluid_rz # name + langmuir_fluid_rz # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz # inputs + Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d b/Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_1d_test_Langmuir_fluid_1d rename to Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d diff --git a/Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d b/Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_2d_test_Langmuir_fluid_2d rename to Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d diff --git a/Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d b/Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_3d_test_Langmuir_fluid_3d rename to Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d diff --git a/Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz b/Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_rz_test_Langmuir_fluid_rz rename to Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index 8c5fc70007b..4fe45fb1d19 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -1,14 +1,14 @@ # Add tests (alphabetical order) ############################################## # -# Larmor ###################################################################### +# larmor ###################################################################### # add_warpx_test( - Larmor # name + larmor # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/larmor/inputs_2d_test_Larmor # inputs + Examples/Tests/larmor/inputs_2d_test_larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/larmor/inputs_2d_test_Larmor b/Examples/Tests/larmor/inputs_2d_test_larmor similarity index 100% rename from Examples/Tests/larmor/inputs_2d_test_Larmor rename to Examples/Tests/larmor/inputs_2d_test_larmor diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index eeba090239d..1ec8f4c3cb9 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -1,74 +1,74 @@ # Add tests (alphabetical order) ############################################## # -# Deuterium_Deuterium_Fusion_3D ############################################### +# deuterium_deuterium_fusion_3d ############################################### # add_warpx_test( - Deuterium_Deuterium_Fusion_3D # name + deuterium_deuterium_fusion_3d # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# Deuterium_Deuterium_Fusion_3D_intraspecies ################################## +# deuterium_deuterium_fusion_3d_intraspecies ################################## # add_warpx_test( - Deuterium_Deuterium_Fusion_3D_intraspecies # name + deuterium_deuterium_fusion_3d_intraspecies # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies # inputs + Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output ) -# Deuterium_Tritium_Fusion_3D ################################################# +# deuterium_tritium_fusion_3d ################################################# # add_warpx_test( - Deuterium_Tritium_Fusion_3D # name + deuterium_tritium_fusion_3d # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# Deuterium_Tritium_Fusion_RZ ################################################# +# deuterium_tritium_fusion_rz ################################################# # add_warpx_test( - Deuterium_Tritium_Fusion_RZ # name + deuterium_tritium_fusion_rz # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ # inputs + Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# Proton_Boron_Fusion_2D ###################################################### +# proton_boron_fusion_2d ###################################################### # add_warpx_test( - Proton_Boron_Fusion_2D # name + proton_boron_fusion_2d # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D # inputs + Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output ) -# Proton_Boron_Fusion_3D ###################################################### +# proton_boron_fusion_3d ###################################################### # add_warpx_test( - Proton_Boron_Fusion_3D # name + proton_boron_fusion_3d # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D # inputs + Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D b/Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_2d_test_Proton_Boron_Fusion_2D rename to Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D b/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D rename to Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies b/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Deuterium_Fusion_3D_intraspecies rename to Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D b/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_Deuterium_Tritium_Fusion_3D rename to Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D b/Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_Proton_Boron_Fusion_3D rename to Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d diff --git a/Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ b/Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_rz_test_Deuterium_Tritium_Fusion_RZ rename to Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz diff --git a/Regression/Checksum/benchmarks_json/BTD_rz.json b/Regression/Checksum/benchmarks_json/btd_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/BTD_rz.json rename to Regression/Checksum/benchmarks_json/btd_rz.json diff --git a/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D.json b/Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D.json rename to Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d.json diff --git a/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json b/Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d_intraspecies.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json rename to Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d_intraspecies.json diff --git a/Regression/Checksum/benchmarks_json/Deuterium_Tritium_Fusion_3D.json b/Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Deuterium_Tritium_Fusion_3D.json rename to Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_3d.json diff --git a/Regression/Checksum/benchmarks_json/Deuterium_Tritium_Fusion_RZ.json b/Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Deuterium_Tritium_Fusion_RZ.json rename to Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_rz.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_MR_emass_10.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_mr_emass_10.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_MR_emass_10.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_mr_emass_10.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_1d.json b/Regression/Checksum/benchmarks_json/langmuir_fluid_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_1d.json rename to Regression/Checksum/benchmarks_json/langmuir_fluid_1d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_2d.json b/Regression/Checksum/benchmarks_json/langmuir_fluid_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_2d.json rename to Regression/Checksum/benchmarks_json/langmuir_fluid_2d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_3d.json b/Regression/Checksum/benchmarks_json/langmuir_fluid_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_3d.json rename to Regression/Checksum/benchmarks_json/langmuir_fluid_3d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_fluid_rz.json b/Regression/Checksum/benchmarks_json/langmuir_fluid_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_fluid_rz.json rename to Regression/Checksum/benchmarks_json/langmuir_fluid_rz.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json b/Regression/Checksum/benchmarks_json/langmuir_multi_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_1d.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_1d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_anisotropic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_anisotropic.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_anisotropic.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_momentum_conserving.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_MR_psatd.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_psatd.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_picmi.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_picmi.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_current_correction_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_current_correction_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_momentum_conserving.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_multiJ_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4.json b/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_2d_psatd_Vay_deposition_particle_shape_4.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_picmi.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_picmi.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_current_correction_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_current_correction_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_div_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_div_cleaning.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_div_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_momentum_conserving.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_multiJ_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_single_precision.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_single_precision.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_Vay_deposition.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_Vay_deposition.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_Vay_deposition_nodal.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_psatd_Vay_deposition_nodal.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition_nodal.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_single_precision.json b/Regression/Checksum/benchmarks_json/langmuir_multi_3d_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_single_precision.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_3d_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_rz.json b/Regression/Checksum/benchmarks_json/langmuir_multi_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_rz.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_rz.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_rz_picmi.json b/Regression/Checksum/benchmarks_json/langmuir_multi_rz_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_rz_picmi.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_rz_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd.json b/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Langmuir_multi_rz_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/Larmor.json b/Regression/Checksum/benchmarks_json/larmor.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Larmor.json rename to Regression/Checksum/benchmarks_json/larmor.json diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json b/Regression/Checksum/benchmarks_json/laser_acceleration_1d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LaserAcceleration_1d.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_1d_picmi.json From a0b5c44d89b8a16d0e58cafb9e834639e41885e4 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 14 Aug 2024 17:44:38 -0700 Subject: [PATCH 079/167] Add more tests --- Examples/Tests/CMakeLists.txt | 1 + Examples/Tests/pml/CMakeLists.txt | 93 +++++++++++++++++++ Examples/Tests/pml/analysis_pml_psatd.py | 6 +- .../Tests/pml/{inputs_2d => inputs_2d_base} | 0 Examples/Tests/pml/inputs_2d_test_pml_x_ckc | 5 + .../Tests/pml/inputs_2d_test_pml_x_galilean | 14 +++ Examples/Tests/pml/inputs_2d_test_pml_x_psatd | 14 +++ Examples/Tests/pml/inputs_2d_test_pml_x_yee | 7 ++ .../Tests/pml/inputs_2d_test_pml_x_yee_eb | 7 ++ ...puts_3d_test_pml_psatd_dive_divb_cleaning} | 3 + ...{inputs_rz => inputs_rz_test_pml_psatd_rz} | 3 + 11 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 Examples/Tests/pml/CMakeLists.txt rename Examples/Tests/pml/{inputs_2d => inputs_2d_base} (100%) create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_ckc create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_galilean create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_psatd create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_yee create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb rename Examples/Tests/pml/{inputs_3d => inputs_3d_test_pml_psatd_dive_divb_cleaning} (94%) rename Examples/Tests/pml/{inputs_rz => inputs_rz_test_pml_psatd_rz} (93%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index a94405e0365..0142ee415ba 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -49,4 +49,5 @@ add_subdirectory(pass_mpi_communicator) add_subdirectory(pec) add_subdirectory(photon_pusher) add_subdirectory(plasma_lens) +add_subdirectory(pml) add_subdirectory(single_particle) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt new file mode 100644 index 00000000000..2b8841ede1e --- /dev/null +++ b/Examples/Tests/pml/CMakeLists.txt @@ -0,0 +1,93 @@ +# Add tests (alphabetical order) ############################################## +# + +# pml_psatd_dive_divb_cleaning ################################################ +# +if(WarpX_FFT) + add_warpx_test( + pml_psatd_dive_divb_cleaning # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000100 # output + ) +endif() + +# pml_psatd_rz ################################################################ +# +if(WarpX_FFT) + add_warpx_test( + pml_psatd_rz # name + RZ # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_rz_test_pml_psatd_rz # inputs + Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis + diags/diag1000500 # output + ) +endif() + +# pml_x_ckc ################################################################### +# +add_warpx_test( + pml_x_ckc # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_ckc # inputs + Examples/Tests/pml/analysis_pml_ckc.py # analysis + diags/diag1000300 # output +) + +# pml_x_galilean ############################################################## +# +add_warpx_test( + pml_x_galilean # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_galilean # inputs + Examples/Tests/pml/analysis_pml_psatd.py # analysis + diags/diag1000300 # output +) + +# FIXME +# pml_x_psatd ################################################################# +# +#add_warpx_test( +# pml_x_psatd # name +# 2 # dims +# 2 # nprocs +# OFF # eb +# Examples/Tests/pml/inputs_2d_test_pml_x_psatd # inputs +# Examples/Tests/pml/analysis_pml_psatd.py # analysis +# diags/diag1000300 # output +#) + +# FIXME +# pml_x_yee ################################################################### +# +#add_warpx_test( +# pml_x_yee # name +# 2 # dims +# 2 # nprocs +# OFF # eb +# Examples/Tests/pml/inputs_2d_test_pml_x_yee # inputs +# Examples/Tests/pml/analysis_pml_yee.py # analysis +# diags/diag1000300 # output +#) + +# FIXME +# pml_x_yee_eb ################################################################ +# +#add_warpx_test( +# pml_x_yee_eb # name +# 2 # dims +# 2 # nprocs +# ON # eb +# Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb # inputs +# Examples/Tests/pml/analysis_pml_yee.py # analysis +# diags/diag1000300 # output +#) diff --git a/Examples/Tests/pml/analysis_pml_psatd.py b/Examples/Tests/pml/analysis_pml_psatd.py index 50d0b2ac1c1..cdbfaae5350 100755 --- a/Examples/Tests/pml/analysis_pml_psatd.py +++ b/Examples/Tests/pml/analysis_pml_psatd.py @@ -20,14 +20,14 @@ filename = sys.argv[1] -galilean = True if re.search("galilean", filename) else False +cwd = os.getcwd() +filename_init = os.path.join(cwd, 'diags/diag1000050') +galilean = True if re.search("galilean", cwd) else False # Initial laser energy (at iteration 50) if galilean: - filename_init = 'pml_x_galilean_plt000050' energy_start = 4.439376199524034e-08 else: - filename_init = 'pml_x_psatd_plt000050' energy_start = 7.282940107273505e-08 # Check consistency of field energy diagnostics with initial energy above diff --git a/Examples/Tests/pml/inputs_2d b/Examples/Tests/pml/inputs_2d_base similarity index 100% rename from Examples/Tests/pml/inputs_2d rename to Examples/Tests/pml/inputs_2d_base diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_ckc b/Examples/Tests/pml/inputs_2d_test_pml_x_ckc new file mode 100644 index 00000000000..16d924e6697 --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_ckc @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.maxwell_solver = ckc diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_galilean b/Examples/Tests/pml/inputs_2d_test_pml_x_galilean new file mode 100644 index 00000000000..023a080498e --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_galilean @@ -0,0 +1,14 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.maxwell_solver = psatd +diag1.fields_to_plot = Ex Ey Ez Bx By Bz rho divE +psatd.current_correction = 0 +psatd.update_with_rho = 1 +psatd.v_galilean = 0. 0. 0.99 +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 +warpx.do_pml_divb_cleaning = 1 +warpx.do_pml_dive_cleaning = 1 +warpx.grid_type = collocated diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd new file mode 100644 index 00000000000..fc2c4864c8f --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd @@ -0,0 +1,14 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.maxwell_solver = psatd +chk.file_prefix = pml_x_psatd_chk +chk.file_min_digits = 5 +diag1.fields_to_plot = Ex Ey Ez Bx By Bz rho divE +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7071067811865475 +warpx.do_pml_divb_cleaning = 0 +warpx.do_pml_dive_cleaning = 0 +psatd.current_correction = 0 +psatd.update_with_rho = 1 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee b/Examples/Tests/pml/inputs_2d_test_pml_x_yee new file mode 100644 index 00000000000..32c953498de --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_yee @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.maxwell_solver = yee +chk.file_prefix = pml_x_yee_chk +chk.file_min_digits = 5 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb new file mode 100644 index 00000000000..6b2a23da265 --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.maxwell_solver = yee +chk.file_prefix = pml_x_yee_eb_chk +chk.file_min_digits = 5 diff --git a/Examples/Tests/pml/inputs_3d b/Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning similarity index 94% rename from Examples/Tests/pml/inputs_3d rename to Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning index e152afc7cc7..4e8c3c78329 100644 --- a/Examples/Tests/pml/inputs_3d +++ b/Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning @@ -14,12 +14,15 @@ boundary.field_lo = pml pml pml boundary.field_hi = pml pml pml # Numerical parameters +ablastr.fillboundary_always_sync = 1 +warpx.abort_on_warning_threshold = medium warpx.cfl = 1.0 warpx.grid_type = staggered warpx.do_dive_cleaning = 1 warpx.do_divb_cleaning = 1 warpx.do_pml_dive_cleaning = 1 warpx.do_pml_divb_cleaning = 1 +warpx.do_similar_dm_pml = 0 warpx.use_filter = 1 warpx.verbose = 1 diff --git a/Examples/Tests/pml/inputs_rz b/Examples/Tests/pml/inputs_rz_test_pml_psatd_rz similarity index 93% rename from Examples/Tests/pml/inputs_rz rename to Examples/Tests/pml/inputs_rz_test_pml_psatd_rz index f5e23fe0399..87b4d7a5b3f 100644 --- a/Examples/Tests/pml/inputs_rz +++ b/Examples/Tests/pml/inputs_rz_test_pml_psatd_rz @@ -25,8 +25,11 @@ warpx.do_pml_in_domain = 0 ############ NUMERICS ########### ################################# algo.maxwell_solver = psatd +warpx.abort_on_warning_threshold = medium +warpx.cfl = 0.7 warpx.use_filter = 0 algo.particle_shape = 1 +psatd.current_correction = 0 ################################# ############ PARTICLE ########### From 932ffa6c0bdd48a9b1aa58a83fc3f10f89982a18 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 15 Aug 2024 09:33:41 -0700 Subject: [PATCH 080/167] Add EB tests only if `WarpX_EB=ON` --- .../electrostatic_sphere_eb/CMakeLists.txt | 80 ++++++++++--------- .../embedded_boundary_cube/CMakeLists.txt | 60 +++++++------- .../CMakeLists.txt | 20 ++--- .../CMakeLists.txt | 20 ++--- .../CMakeLists.txt | 40 +++++----- Examples/Tests/embedded_circle/CMakeLists.txt | 20 ++--- .../Tests/magnetostatic_eb/CMakeLists.txt | 60 +++++++------- .../particle_boundary_process/CMakeLists.txt | 20 ++--- .../particle_boundary_scrape/CMakeLists.txt | 40 +++++----- 9 files changed, 198 insertions(+), 162 deletions(-) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index c970edc2553..80bafed2a2c 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -3,48 +3,56 @@ # electrostatic_sphere_eb ##################################################### # -add_warpx_test( - electrostatic_sphere_eb # name - 3 # dims - 2 # nprocs - ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs - Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + electrostatic_sphere_eb # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs + Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis + diags/diag1000001 # output + ) +endif() # electrostatic_sphere_eb_mixed_bc ############################################ # -add_warpx_test( - electrostatic_sphere_eb_mixed_bc # name - 3 # dims - 2 # nprocs - ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs - Examples/analysis_default_regression.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + electrostatic_sphere_eb_mixed_bc # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output + ) +endif() # electrostatic_sphere_eb_rz ################################################## # -add_warpx_test( - electrostatic_sphere_eb_rz # name - RZ # dims - 2 # nprocs - ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs - Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + electrostatic_sphere_eb_rz # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs + Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis + diags/diag1000001 # output + ) +endif() # electrostatic_sphere_eb_rz_mr ############################################### # -add_warpx_test( - electrostatic_sphere_eb_rz_mr # name - RZ # dims - 2 # nprocs - ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs - Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis - diags/diag1/ # output -) +if(WarpX_EB) + add_warpx_test( + electrostatic_sphere_eb_rz_mr # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs + Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis + diags/diag1/ # output + ) +endif() diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index c23591ecad8..2afb81f8b9a 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -3,36 +3,42 @@ # embedded_boundary_cube_2d ################################################### # -add_warpx_test( - embedded_boundary_cube_2d # name - 2 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis - diags/diag1000114 # output -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_cube_2d # name + 2 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis + diags/diag1000114 # output + ) +endif() # embedded_boundary_cube_3d ################################################### # -add_warpx_test( - embedded_boundary_cube_3d # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis - diags/diag1000208 # output -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_cube_3d # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + diags/diag1000208 # output + ) +endif() # embedded_boundary_cube_3d_macroscopic ####################################### # -add_warpx_test( - embedded_boundary_cube_3d_macroscopic # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis - diags/diag1000208 # output -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_cube_3d_macroscopic # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs + Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + diags/diag1000208 # output + ) +endif() diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index 07406bdc9c8..a97e506040f 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -3,12 +3,14 @@ # embedded_boundary_diffraction ############################################### # -add_warpx_test( - embedded_boundary_diffraction # name - RZ # dims - 2 # nprocs - ON # eb - Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs - Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis - diags/diag1/ # output -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_diffraction # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs + Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis + diags/diag1/ # output + ) +endif() diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index ed80e09217e..d4b349b0ae4 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -3,12 +3,14 @@ # embedded_boundary_python_api ################################################ # -add_warpx_test( - embedded_boundary_picmi # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs - Examples/Tests/embedded_boundary_python_api/analysis.py # analysis - diags/diag1000002 -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_picmi # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs + Examples/Tests/embedded_boundary_python_api/analysis.py # analysis + diags/diag1000002 + ) +endif() diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 12db7eb2d0f..53e9b9681b9 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -3,24 +3,28 @@ # embedded_boundary_rotated_cube_2d ########################################### # -add_warpx_test( - embedded_boundary_rotated_cube_2d # name - 2 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs - Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis - diags/diag1000068 -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_rotated_cube_2d # name + 2 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs + Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis + diags/diag1000068 + ) +endif() # embedded_boundary_rotated_cube_3d ########################################### # -add_warpx_test( - embedded_boundary_rotated_cube_3d # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs - Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis - diags/diag1000111 -) +if(WarpX_EB) + add_warpx_test( + embedded_boundary_rotated_cube_3d # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs + Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis + diags/diag1000111 + ) +endif() diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index 788c454766a..f6549c1c87f 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -3,12 +3,14 @@ # embedded_circle ############################################################# # -add_warpx_test( - embedded_circle # name - 2 # dims - 2 # nprocs - ON # eb - Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle # inputs - Examples/Tests/embedded_circle/analysis.py # analysis - diags/diag1000011 -) +if(WarpX_EB) + add_warpx_test( + embedded_circle # name + 2 # dims + 2 # nprocs + ON # eb + Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle # inputs + Examples/Tests/embedded_circle/analysis.py # analysis + diags/diag1000011 + ) +endif() diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index 94c2b324976..683e3b98fd4 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -3,36 +3,42 @@ # magnetostatic_eb_3d ######################################################### # -add_warpx_test( - magnetostatic_eb_3d # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d # inputs - Examples/analysis_default_regression.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + magnetostatic_eb_3d # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output + ) +endif() # magnetostatic_eb_3d_picmi ################################################### # -add_warpx_test( - magnetostatic_eb_3d_picmi # name - 3 # dims - 1 # nprocs - ON # eb - Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py # inputs - Examples/analysis_default_regression.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + magnetostatic_eb_3d_picmi # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output + ) +endif() # magnetostatic_eb_rz_picmi ################################################### # -add_warpx_test( - magnetostatic_eb_rz_picmi # name - RZ # dims - 1 # nprocs - ON # eb - Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py # inputs - Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis - diags/diag1000001 # output -) +if(WarpX_EB) + add_warpx_test( + magnetostatic_eb_rz_picmi # name + RZ # dims + 1 # nprocs + ON # eb + Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py # inputs + Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis + diags/diag1000001 # output + ) +endif() diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index b59e26b80a2..89bc251bd9a 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -3,15 +3,17 @@ # particle_absorption ######################################################### # -add_warpx_test( - particle_absorption # name - 3 # dims - 2 # nprocs - ON # eb - Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption # inputs - Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis - diags/diag1000060 # output -) +if(WarpX_EB) + add_warpx_test( + particle_absorption # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption # inputs + Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis + diags/diag1000060 # output + ) +endif() # particle_reflection_picmi ################################################### # diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 666a5f093f7..6ba73530942 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -3,24 +3,28 @@ # particle_scrape ############################################################# # -add_warpx_test( - particle_scrape # name - 3 # dims - 2 # nprocs - ON # eb - Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape # inputs - Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis - diags/diag1000060 # output -) +if(WarpX_EB) + add_warpx_test( + particle_scrape # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape # inputs + Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + diags/diag1000060 # output + ) +endif() # particle_scrape_picmi ####################################################### # -add_warpx_test( - particle_scrape_picmi # name - 3 # dims - 2 # nprocs - ON # eb - Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py # inputs - Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis - diags/diag1000060 # output -) +if(WarpX_EB) + add_warpx_test( + particle_scrape_picmi # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py # inputs + Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + diags/diag1000060 # output + ) +endif() From 02bc2459466d2ad9503ef5b2f2b7296d36eba41e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 15 Aug 2024 11:06:40 -0700 Subject: [PATCH 081/167] Fix broken tests, add restart tests --- .azure-pipelines.yml | 2 + .../Tests/load_external_field/CMakeLists.txt | 64 +++++++++++------ ...inputs_rz_test_load_external_field_rz_grid | 1 + ...z_test_load_external_field_rz_grid_restart | 5 ++ ..._rz_test_load_external_field_rz_particles} | 1 + ...t_load_external_field_rz_particles_restart | 5 ++ Examples/Tests/pml/CMakeLists.txt | 71 +++++++++++-------- Examples/Tests/pml/analysis_pml_psatd.py | 12 ++-- Examples/Tests/pml/analysis_pml_yee.py | 10 +-- Examples/Tests/pml/inputs_2d_test_pml_x_psatd | 2 - .../pml/inputs_2d_test_pml_x_psatd_restart | 5 ++ Examples/Tests/pml/inputs_2d_test_pml_x_yee | 2 - .../Tests/pml/inputs_2d_test_pml_x_yee_eb | 7 -- .../pml/inputs_2d_test_pml_x_yee_restart | 5 ++ Examples/analysis_default_regression.py | 11 ++- 15 files changed, 128 insertions(+), 75 deletions(-) create mode 100644 Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart rename Examples/Tests/load_external_field/{inputs_rz_test_load_external_field_rz_particle => inputs_rz_test_load_external_field_rz_particles} (97%) create mode 100644 Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart delete mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb create mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c9a8e3d15ac..415e9f688e1 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -137,6 +137,8 @@ jobs: # external repositories required for test analysis cd .. git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git + # FIXME do we want to select only specific datasets? + git clone --depth 1 https://github.com/openPMD/openPMD-example-datasets.git cd - rm -rf ${CEI_TMP} df -h diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 3c67854ee4f..68e58e369a4 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -25,28 +25,50 @@ add_warpx_test( diags/diag1000300 # output ) -# FIXME # load_external_field_rz_grid ################################################# # -#add_warpx_test( -# load_external_field_rz_grid # name -# RZ # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid # inputs -# Examples/Tests/load_external_field/analysis_rz.py # analysis -# diags/diag1000300 # output -#) +add_warpx_test( + load_external_field_rz_grid # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid # inputs + Examples/Tests/load_external_field/analysis_rz.py # analysis + diags/diag1000300 # output +) + +# load_external_field_rz_grid_restart ######################################### +# +add_warpx_test( + load_external_field_rz_grid_restart # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000300 # output +) -# FIXME -# load_external_field_rz_particle ############################################# +# load_external_field_rz_particles ############################################ # -#add_warpx_test( -# load_external_field_rz_particle # name -# RZ # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle # inputs -# Examples/Tests/load_external_field/analysis_rz.py # analysis -# diags/diag1000300 # output -#) +add_warpx_test( + load_external_field_rz_particles # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles # inputs + Examples/Tests/load_external_field/analysis_rz.py # analysis + diags/diag1000300 # output +) + +# load_external_field_rz_particles_restart #################################### +# +add_warpx_test( + load_external_field_rz_particles_restart # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000300 # output +) diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid index 2e22ca299ea..f986add7bf5 100644 --- a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid +++ b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid @@ -1,3 +1,4 @@ +warpx.abort_on_warning_threshold = medium warpx.serialize_initial_conditions = 0 warpx.do_dynamic_scheduling = 0 particles.do_tiling = 0 diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart new file mode 100644 index 00000000000..2c9a97156e0 --- /dev/null +++ b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_rz_test_load_external_field_rz_grid + +# test input parameters +amr.restart = ../load_external_field_rz_grid/diags/chk000150 diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles similarity index 97% rename from Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle rename to Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles index b76d4cb7efc..e725ed588b0 100644 --- a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particle +++ b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles @@ -1,3 +1,4 @@ +warpx.abort_on_warning_threshold = medium warpx.serialize_initial_conditions = 0 warpx.do_dynamic_scheduling = 0 particles.do_tiling = 0 diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart new file mode 100644 index 00000000000..59adefc23d6 --- /dev/null +++ b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_rz_test_load_external_field_rz_particles + +# test input parameters +amr.restart = ../load_external_field_rz_particles/diags/chk000150 diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 2b8841ede1e..a35945c0218 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -53,41 +53,50 @@ add_warpx_test( diags/diag1000300 # output ) -# FIXME # pml_x_psatd ################################################################# # -#add_warpx_test( -# pml_x_psatd # name -# 2 # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/pml/inputs_2d_test_pml_x_psatd # inputs -# Examples/Tests/pml/analysis_pml_psatd.py # analysis -# diags/diag1000300 # output -#) +add_warpx_test( + pml_x_psatd # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_psatd # inputs + Examples/Tests/pml/analysis_pml_psatd.py # analysis + diags/diag1000300 # output +) + +# pml_x_psatd_restart ######################################################### +# +add_warpx_test( + pml_x_psatd_restart # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000300 # output +) -# FIXME # pml_x_yee ################################################################### # -#add_warpx_test( -# pml_x_yee # name -# 2 # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/pml/inputs_2d_test_pml_x_yee # inputs -# Examples/Tests/pml/analysis_pml_yee.py # analysis -# diags/diag1000300 # output -#) +add_warpx_test( + pml_x_yee # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_yee # inputs + Examples/Tests/pml/analysis_pml_yee.py # analysis + diags/diag1000300 # output +) -# FIXME -# pml_x_yee_eb ################################################################ +# pml_x_yee_restart ########################################################### # -#add_warpx_test( -# pml_x_yee_eb # name -# 2 # dims -# 2 # nprocs -# ON # eb -# Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb # inputs -# Examples/Tests/pml/analysis_pml_yee.py # analysis -# diags/diag1000300 # output -#) +add_warpx_test( + pml_x_yee_restart # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000300 # output +) diff --git a/Examples/Tests/pml/analysis_pml_psatd.py b/Examples/Tests/pml/analysis_pml_psatd.py index cdbfaae5350..082bff8a3c7 100755 --- a/Examples/Tests/pml/analysis_pml_psatd.py +++ b/Examples/Tests/pml/analysis_pml_psatd.py @@ -70,12 +70,12 @@ assert(reflectivity < reflectivity_max) -# Check restart data v. original data -sys.path.insert(0, '../../../../warpx/Examples/') -from analysis_default_restart import check_restart - -if not galilean: - check_restart(filename) +## Check restart data v. original data +#sys.path.insert(0, '../../../../warpx/Examples/') +#from analysis_default_restart import check_restart +# +#if not galilean: +# check_restart(filename) test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/pml/analysis_pml_yee.py b/Examples/Tests/pml/analysis_pml_yee.py index f10b281c544..0de1eb4fd3f 100755 --- a/Examples/Tests/pml/analysis_pml_yee.py +++ b/Examples/Tests/pml/analysis_pml_yee.py @@ -54,11 +54,11 @@ assert( error_rel < tolerance_rel ) -# Check restart data v. original data -sys.path.insert(0, '../../../../warpx/Examples/') -from analysis_default_restart import check_restart - -check_restart(filename) +## Check restart data v. original data +#sys.path.insert(0, '../../../../warpx/Examples/') +#from analysis_default_restart import check_restart +# +#check_restart(filename) test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd index fc2c4864c8f..da8ab3a3a02 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd @@ -3,8 +3,6 @@ FILE = inputs_2d_base # test input parameters algo.maxwell_solver = psatd -chk.file_prefix = pml_x_psatd_chk -chk.file_min_digits = 5 diag1.fields_to_plot = Ex Ey Ez Bx By Bz rho divE warpx.abort_on_warning_threshold = medium warpx.cfl = 0.7071067811865475 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart new file mode 100644 index 00000000000..cadbbdb898c --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_2d_test_pml_x_psatd + +# test input parameters +amr.restart = ../pml_x_psatd/diags/chk000150 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee b/Examples/Tests/pml/inputs_2d_test_pml_x_yee index 32c953498de..c33b3886a36 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_yee +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_yee @@ -3,5 +3,3 @@ FILE = inputs_2d_base # test input parameters algo.maxwell_solver = yee -chk.file_prefix = pml_x_yee_chk -chk.file_min_digits = 5 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb deleted file mode 100644 index 6b2a23da265..00000000000 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_eb +++ /dev/null @@ -1,7 +0,0 @@ -# base input parameters -FILE = inputs_2d_base - -# test input parameters -algo.maxwell_solver = yee -chk.file_prefix = pml_x_yee_eb_chk -chk.file_min_digits = 5 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart new file mode 100644 index 00000000000..e7a5794e52e --- /dev/null +++ b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_2d_test_pml_x_yee + +# test input parameters +amr.restart = ../pml_x_yee/diags/chk000150 diff --git a/Examples/analysis_default_regression.py b/Examples/analysis_default_regression.py index 453f650be01..e9e471723b2 100755 --- a/Examples/analysis_default_regression.py +++ b/Examples/analysis_default_regression.py @@ -13,8 +13,17 @@ # Get name of the test test_name = os.path.split(os.getcwd())[1] +restart = "restart" in test_name + +if restart: + test_name = test_name.replace("_restart", "") + # Run checksum regression test if re.search( 'single_precision', fn ): checksumAPI.evaluate_checksum(test_name, fn, rtol=2.e-6) else: - checksumAPI.evaluate_checksum(test_name, fn) + if restart: + checksumAPI.evaluate_checksum(test_name, fn, rtol=1e-12) + else: + # using default relative tolerance + checksumAPI.evaluate_checksum(test_name, fn) From 980e897a2ffee6170120b3ec4cbe72d47415283e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 15 Aug 2024 13:03:34 -0700 Subject: [PATCH 082/167] Add more tests --- Examples/Tests/CMakeLists.txt | 14 ++ .../Tests/point_of_contact_eb/CMakeLists.txt | 30 +++++ .../analysis.py | 0 .../inputs_3d_test_point_of_contact_eb_3d} | 0 .../inputs_rz_test_point_of_contact_eb_rz} | 0 Examples/Tests/python_wrappers/CMakeLists.txt | 16 +++ ...> inputs_2d_test_python_wrappers_picmi.py} | 0 Examples/Tests/qed/CMakeLists.txt | 122 ++++++++++++++++++ ...core.py => analysis_breit_wheeler_core.py} | 0 ...opmd.py => analysis_breit_wheeler_opmd.py} | 4 +- ...sis_yt.py => analysis_breit_wheeler_yt.py} | 4 +- .../analysis.py => analysis_quantum_sync.py} | 0 .../qed/{schwinger => }/analysis_schwinger.py | 3 +- ...inputs_2d => inputs_2d_base_breit_wheeler} | 1 + .../qed/inputs_2d_test_qed_breit_wheeler_2d | 2 + .../inputs_2d_test_qed_breit_wheeler_2d_opmd | 6 + ..._2d => inputs_2d_test_qed_quantum_sync_2d} | 1 + ...inputs_3d => inputs_3d_base_breit_wheeler} | 0 ..._3d_schwinger => inputs_3d_base_schwinger} | 0 .../qed/inputs_3d_test_qed_breit_wheeler_3d | 2 + .../inputs_3d_test_qed_breit_wheeler_3d_opmd | 6 + ..._3d => inputs_3d_test_qed_quantum_sync_3d} | 1 + .../Tests/qed/inputs_3d_test_qed_schwinger_1 | 6 + .../Tests/qed/inputs_3d_test_qed_schwinger_2 | 8 ++ .../Tests/qed/inputs_3d_test_qed_schwinger_3 | 5 + .../Tests/qed/inputs_3d_test_qed_schwinger_4 | 8 ++ .../Tests/radiation_reaction/CMakeLists.txt | 14 ++ .../analysis_classicalRR.py => analysis.py} | 0 ...s_3d => inputs_3d_test_radiation_reaction} | 0 .../CMakeLists.txt | 14 ++ ..._relativistic_space_charge_initialization} | 0 .../Tests/repelling_particles/CMakeLists.txt | 14 ++ .../{analysis_repelling.py => analysis.py} | 0 ..._2d => inputs_2d_test_repelling_particles} | 0 Examples/Tests/resampling/CMakeLists.txt | 38 ++++++ ...lysis_leveling_thinning.py => analysis.py} | 0 ...uts_1d_test_velocity_coincidence_thinning} | 0 ...t_velocity_coincidence_thinning_cartesian} | 0 ...nning => inputs_2d_test_leveling_thinning} | 0 Examples/Tests/restart/CMakeLists.txt | 107 +++++++++++++++ Examples/Tests/restart/analysis_restart.py | 20 --- ...py => inputs_2d_test_id_cpu_read_picmi.py} | 4 - ..._test_restart_runtime_components_picmi.py} | 0 .../Tests/restart/{inputs => inputs_3d_base} | 1 - .../Tests/restart/inputs_3d_test_acceleration | 2 + .../restart/inputs_3d_test_acceleration_psatd | 11 ++ .../inputs_3d_test_acceleration_psatd_restart | 5 + ...inputs_3d_test_acceleration_psatd_time_avg | 12 ++ ...d_test_acceleration_psatd_time_avg_restart | 5 + .../inputs_3d_test_acceleration_restart | 5 + Examples/Tests/rigid_injection/CMakeLists.txt | 26 ++++ ...ame.py => analysis_rigid_injection_btd.py} | 0 ...ame.py => analysis_rigid_injection_lab.py} | 0 ...ame => inputs_2d_test_rigid_injection_btd} | 0 ...ame => inputs_2d_test_rigid_injection_lab} | 0 Examples/Tests/scraping/CMakeLists.txt | 30 +++++ .../{inputs_rz => inputs_rz_test_scraping} | 1 + ..._filter => inputs_rz_test_scraping_filter} | 1 + Examples/Tests/silver_mueller/CMakeLists.txt | 50 +++++++ ...analysis_silver_mueller.py => analysis.py} | 0 ...ts_1d => inputs_1d_test_silver_mueller_1d} | 0 ...d_x => inputs_2d_test_silver_mueller_2d_x} | 0 ...d_z => inputs_2d_test_silver_mueller_2d_z} | 0 ...z_z => inputs_rz_test_silver_mueller_rz_z} | 0 .../CMakeLists.txt | 26 ++++ .../{inputs_3d => inputs_3d_base} | 0 ...uts_3d_test_space_charge_initialization_2d | 5 + ...uts_3d_test_space_charge_initialization_3d | 2 + Examples/Tests/subcycling/CMakeLists.txt | 14 ++ ...inputs_2d => inputs_2d_test_subcycling_mr} | 0 Examples/Tests/vay_deposition/CMakeLists.txt | 30 +++++ ...ts_2d => inputs_2d_test_vay_deposition_2d} | 0 ...ts_3d => inputs_3d_test_vay_deposition_3d} | 0 .../{restart.json => acceleration.json} | 0 ...art_psatd.json => acceleration_psatd.json} | 0 ....json => acceleration_psatd_time_avg.json} | 0 ...EB_3d.json => point_of_contact_eb_3d.json} | 0 ...EB_rz.json => point_of_contact_eb_rz.json} | 0 ...appers.json => python_wrappers_picmi.json} | 0 ...d_schwinger1.json => qed_schwinger_1.json} | 0 ...d_schwinger2.json => qed_schwinger_2.json} | 0 ...d_schwinger3.json => qed_schwinger_3.json} | 0 ...d_schwinger4.json => qed_schwinger_4.json} | 0 ...articles.json => repelling_particles.json} | 0 ...tion_BTD.json => rigid_injection_btd.json} | 0 ...tion_lab.json => rigid_injection_lab.json} | 0 ...on => space_charge_initialization_3d.json} | 0 .../{subcyclingMR.json => subcycling_mr.json} | 0 ...position2D.json => vay_deposition_2d.json} | 0 ...position3D.json => vay_deposition_3d.json} | 0 90 files changed, 646 insertions(+), 30 deletions(-) create mode 100644 Examples/Tests/point_of_contact_eb/CMakeLists.txt rename Examples/Tests/{point_of_contact_EB => point_of_contact_eb}/analysis.py (100%) rename Examples/Tests/{point_of_contact_EB/inputs_3d => point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d} (100%) rename Examples/Tests/{point_of_contact_EB/inputs_rz => point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz} (100%) create mode 100644 Examples/Tests/python_wrappers/CMakeLists.txt rename Examples/Tests/python_wrappers/{PICMI_inputs_2d.py => inputs_2d_test_python_wrappers_picmi.py} (100%) create mode 100644 Examples/Tests/qed/CMakeLists.txt rename Examples/Tests/qed/{breit_wheeler/analysis_core.py => analysis_breit_wheeler_core.py} (100%) rename Examples/Tests/qed/{breit_wheeler/analysis_opmd.py => analysis_breit_wheeler_opmd.py} (94%) rename Examples/Tests/qed/{breit_wheeler/analysis_yt.py => analysis_breit_wheeler_yt.py} (94%) rename Examples/Tests/qed/{quantum_synchrotron/analysis.py => analysis_quantum_sync.py} (100%) rename Examples/Tests/qed/{schwinger => }/analysis_schwinger.py (97%) rename Examples/Tests/qed/{breit_wheeler/inputs_2d => inputs_2d_base_breit_wheeler} (99%) create mode 100644 Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d create mode 100644 Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd rename Examples/Tests/qed/{quantum_synchrotron/inputs_2d => inputs_2d_test_qed_quantum_sync_2d} (99%) rename Examples/Tests/qed/{breit_wheeler/inputs_3d => inputs_3d_base_breit_wheeler} (100%) rename Examples/Tests/qed/{schwinger/inputs_3d_schwinger => inputs_3d_base_schwinger} (100%) create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd rename Examples/Tests/qed/{quantum_synchrotron/inputs_3d => inputs_3d_test_qed_quantum_sync_3d} (99%) create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 create mode 100644 Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 create mode 100644 Examples/Tests/radiation_reaction/CMakeLists.txt rename Examples/Tests/radiation_reaction/{test_const_B_analytical/analysis_classicalRR.py => analysis.py} (100%) rename Examples/Tests/radiation_reaction/{test_const_B_analytical/inputs_3d => inputs_3d_test_radiation_reaction} (100%) create mode 100644 Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt rename Examples/Tests/relativistic_space_charge_initialization/{inputs_3d => inputs_3d_test_relativistic_space_charge_initialization} (100%) create mode 100644 Examples/Tests/repelling_particles/CMakeLists.txt rename Examples/Tests/repelling_particles/{analysis_repelling.py => analysis.py} (100%) rename Examples/Tests/repelling_particles/{inputs_2d => inputs_2d_test_repelling_particles} (100%) create mode 100644 Examples/Tests/resampling/CMakeLists.txt rename Examples/Tests/resampling/{analysis_leveling_thinning.py => analysis.py} (100%) rename Examples/Tests/resampling/{inputs_1d_velocity_coincidence_thinning => inputs_1d_test_velocity_coincidence_thinning} (100%) rename Examples/Tests/resampling/{inputs_1d_velocity_coincidence_thinning_cartesian => inputs_1d_test_velocity_coincidence_thinning_cartesian} (100%) rename Examples/Tests/resampling/{inputs_leveling_thinning => inputs_2d_test_leveling_thinning} (100%) create mode 100644 Examples/Tests/restart/CMakeLists.txt delete mode 100755 Examples/Tests/restart/analysis_restart.py rename Examples/Tests/restart/{PICMI_inputs_id_cpu_read.py => inputs_2d_test_id_cpu_read_picmi.py} (95%) rename Examples/Tests/restart/{PICMI_inputs_runtime_component_analyze.py => inputs_2d_test_restart_runtime_components_picmi.py} (100%) rename Examples/Tests/restart/{inputs => inputs_3d_base} (99%) create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart create mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_restart create mode 100644 Examples/Tests/rigid_injection/CMakeLists.txt rename Examples/Tests/rigid_injection/{analysis_rigid_injection_BoostedFrame.py => analysis_rigid_injection_btd.py} (100%) rename Examples/Tests/rigid_injection/{analysis_rigid_injection_LabFrame.py => analysis_rigid_injection_lab.py} (100%) rename Examples/Tests/rigid_injection/{inputs_2d_BoostedFrame => inputs_2d_test_rigid_injection_btd} (100%) rename Examples/Tests/rigid_injection/{inputs_2d_LabFrame => inputs_2d_test_rigid_injection_lab} (100%) create mode 100644 Examples/Tests/scraping/CMakeLists.txt rename Examples/Tests/scraping/{inputs_rz => inputs_rz_test_scraping} (97%) rename Examples/Tests/scraping/{inputs_rz_filter => inputs_rz_test_scraping_filter} (97%) create mode 100644 Examples/Tests/silver_mueller/CMakeLists.txt rename Examples/Tests/silver_mueller/{analysis_silver_mueller.py => analysis.py} (100%) rename Examples/Tests/silver_mueller/{inputs_1d => inputs_1d_test_silver_mueller_1d} (100%) rename Examples/Tests/silver_mueller/{inputs_2d_x => inputs_2d_test_silver_mueller_2d_x} (100%) rename Examples/Tests/silver_mueller/{inputs_2d_z => inputs_2d_test_silver_mueller_2d_z} (100%) rename Examples/Tests/silver_mueller/{inputs_rz_z => inputs_rz_test_silver_mueller_rz_z} (100%) create mode 100644 Examples/Tests/space_charge_initialization/CMakeLists.txt rename Examples/Tests/space_charge_initialization/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d create mode 100644 Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d create mode 100644 Examples/Tests/subcycling/CMakeLists.txt rename Examples/Tests/subcycling/{inputs_2d => inputs_2d_test_subcycling_mr} (100%) create mode 100644 Examples/Tests/vay_deposition/CMakeLists.txt rename Examples/Tests/vay_deposition/{inputs_2d => inputs_2d_test_vay_deposition_2d} (100%) rename Examples/Tests/vay_deposition/{inputs_3d => inputs_3d_test_vay_deposition_3d} (100%) rename Regression/Checksum/benchmarks_json/{restart.json => acceleration.json} (100%) rename Regression/Checksum/benchmarks_json/{restart_psatd.json => acceleration_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{restart_psatd_time_avg.json => acceleration_psatd_time_avg.json} (100%) rename Regression/Checksum/benchmarks_json/{Point_of_contact_EB_3d.json => point_of_contact_eb_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{Point_of_contact_EB_rz.json => point_of_contact_eb_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_wrappers.json => python_wrappers_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger1.json => qed_schwinger_1.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger2.json => qed_schwinger_2.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger3.json => qed_schwinger_3.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger4.json => qed_schwinger_4.json} (100%) rename Regression/Checksum/benchmarks_json/{RepellingParticles.json => repelling_particles.json} (100%) rename Regression/Checksum/benchmarks_json/{RigidInjection_BTD.json => rigid_injection_btd.json} (100%) rename Regression/Checksum/benchmarks_json/{RigidInjection_lab.json => rigid_injection_lab.json} (100%) rename Regression/Checksum/benchmarks_json/{space_charge_initialization.json => space_charge_initialization_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{subcyclingMR.json => subcycling_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{VayDeposition2D.json => vay_deposition_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{VayDeposition3D.json => vay_deposition_3d.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 0142ee415ba..b0dd5fb6800 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -50,4 +50,18 @@ add_subdirectory(pec) add_subdirectory(photon_pusher) add_subdirectory(plasma_lens) add_subdirectory(pml) +add_subdirectory(point_of_contact_eb) +add_subdirectory(python_wrappers) +add_subdirectory(qed) +add_subdirectory(radiation_reaction) +add_subdirectory(relativistic_space_charge_initialization) +add_subdirectory(repelling_particles) +add_subdirectory(resampling) +add_subdirectory(restart) +add_subdirectory(rigid_injection) +add_subdirectory(scraping) +add_subdirectory(silver_mueller) add_subdirectory(single_particle) +add_subdirectory(space_charge_initialization) +add_subdirectory(subcycling) +add_subdirectory(vay_deposition) diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt new file mode 100644 index 00000000000..e7dcef059f8 --- /dev/null +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -0,0 +1,30 @@ +# Add tests (alphabetical order) ############################################## +# + +# point_of_contact_eb_3d ###################################################### +# +if(WarpX_EB) + add_warpx_test( + point_of_contact_eb_3d # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d # inputs + Examples/Tests/point_of_contact_eb/analysis.py # analysis + diags/diag1000003 # output + ) +endif() + +# point_of_contact_eb_rz ###################################################### +# +if(WarpX_EB) + add_warpx_test( + point_of_contact_eb_rz # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz # inputs + Examples/Tests/point_of_contact_eb/analysis.py # analysis + diags/diag1000003 # output + ) +endif() diff --git a/Examples/Tests/point_of_contact_EB/analysis.py b/Examples/Tests/point_of_contact_eb/analysis.py similarity index 100% rename from Examples/Tests/point_of_contact_EB/analysis.py rename to Examples/Tests/point_of_contact_eb/analysis.py diff --git a/Examples/Tests/point_of_contact_EB/inputs_3d b/Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d similarity index 100% rename from Examples/Tests/point_of_contact_EB/inputs_3d rename to Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d diff --git a/Examples/Tests/point_of_contact_EB/inputs_rz b/Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz similarity index 100% rename from Examples/Tests/point_of_contact_EB/inputs_rz rename to Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt new file mode 100644 index 00000000000..79278b1bfa6 --- /dev/null +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -0,0 +1,16 @@ +# Add tests (alphabetical order) ############################################## +# + +# python_wrappers_picmi ####################################################### +# +if(WarpX_FFT) + add_warpx_test( + python_wrappers_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000100 # output + ) +endif() diff --git a/Examples/Tests/python_wrappers/PICMI_inputs_2d.py b/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py similarity index 100% rename from Examples/Tests/python_wrappers/PICMI_inputs_2d.py rename to Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt new file mode 100644 index 00000000000..bfcb452f8a1 --- /dev/null +++ b/Examples/Tests/qed/CMakeLists.txt @@ -0,0 +1,122 @@ +# Add tests (alphabetical order) ############################################## +# + +# qed_breit_wheeler_2d ######################################################## +# +add_warpx_test( + qed_breit_wheeler_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d # inputs + Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis + diags/diag1000002 # output +) + +# qed_breit_wheeler_2d_opmd ################################################### +# +add_warpx_test( + qed_breit_wheeler_2d_opmd # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd # inputs + Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis + diags/diag1/ # output +) + +# qed_breit_wheeler_3d ######################################################## +# +add_warpx_test( + qed_breit_wheeler_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d # inputs + Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis + diags/diag1000002 # output +) + +# qed_breit_wheeler_3d_opmd ################################################### +# +add_warpx_test( + qed_breit_wheeler_3d_opmd # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd # inputs + Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis + diags/diag1/ # output +) + +# qed_quantum_sync_2d ######################################################### +# +add_warpx_test( + qed_quantum_sync_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d # inputs + Examples/Tests/qed/analysis_quantum_sync.py # analysis + diags/diag1000002 # output +) + +# qed_quantum_sync_3d ######################################################### +# +add_warpx_test( + qed_quantum_sync_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d # inputs + Examples/Tests/qed/analysis_quantum_sync.py # analysis + diags/diag1000002 # output +) + +# qed_schwinger_1 ############################################################# +# +add_warpx_test( + qed_schwinger_1 # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 # inputs + Examples/Tests/qed/analysis_schwinger.py # analysis + diags/diag1000001 # output +) + +# qed_schwinger_2 ############################################################# +# +add_warpx_test( + qed_schwinger_2 # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 # inputs + Examples/Tests/qed/analysis_schwinger.py # analysis + diags/diag1000001 # output +) + +# qed_schwinger_3 ############################################################# +# +add_warpx_test( + qed_schwinger_3 # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 # inputs + Examples/Tests/qed/analysis_schwinger.py # analysis + diags/diag1000001 # output +) + +# qed_schwinger_4 ############################################################# +# +add_warpx_test( + qed_schwinger_4 # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 # inputs + Examples/Tests/qed/analysis_schwinger.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/qed/breit_wheeler/analysis_core.py b/Examples/Tests/qed/analysis_breit_wheeler_core.py similarity index 100% rename from Examples/Tests/qed/breit_wheeler/analysis_core.py rename to Examples/Tests/qed/analysis_breit_wheeler_core.py diff --git a/Examples/Tests/qed/breit_wheeler/analysis_opmd.py b/Examples/Tests/qed/analysis_breit_wheeler_opmd.py similarity index 94% rename from Examples/Tests/qed/breit_wheeler/analysis_opmd.py rename to Examples/Tests/qed/analysis_breit_wheeler_opmd.py index 2b1fbc7038b..b8c49d5472e 100755 --- a/Examples/Tests/qed/breit_wheeler/analysis_opmd.py +++ b/Examples/Tests/qed/analysis_breit_wheeler_opmd.py @@ -9,7 +9,7 @@ import sys -import analysis_core as ac +import analysis_breit_wheeler_core as ac import openpmd_api as io #sys.path.insert(1, '../../../../warpx/Regression/Checksum/') @@ -17,7 +17,7 @@ # This script is a frontend for the analysis routines -# in analysis_core.py (please refer to this file for +# in analysis_breit_wheeler_core.py (please refer to this file for # a full description). It reads output files in openPMD # format and extracts the data needed for # the analysis routines. diff --git a/Examples/Tests/qed/breit_wheeler/analysis_yt.py b/Examples/Tests/qed/analysis_breit_wheeler_yt.py similarity index 94% rename from Examples/Tests/qed/breit_wheeler/analysis_yt.py rename to Examples/Tests/qed/analysis_breit_wheeler_yt.py index e8950419f25..f52df620cc4 100755 --- a/Examples/Tests/qed/breit_wheeler/analysis_yt.py +++ b/Examples/Tests/qed/analysis_breit_wheeler_yt.py @@ -13,11 +13,11 @@ import yt sys.path.insert(1, '../../../../warpx/Regression/Checksum/') -import analysis_core as ac +import analysis_breit_wheeler_core as ac import checksumAPI # This script is a frontend for the analysis routines -# in analysis_core.py (please refer to this file for +# in analysis_breit_wheeler_core.py (please refer to this file for # a full description). It reads output files in yt # format and extracts the data needed for # the analysis routines. diff --git a/Examples/Tests/qed/quantum_synchrotron/analysis.py b/Examples/Tests/qed/analysis_quantum_sync.py similarity index 100% rename from Examples/Tests/qed/quantum_synchrotron/analysis.py rename to Examples/Tests/qed/analysis_quantum_sync.py diff --git a/Examples/Tests/qed/schwinger/analysis_schwinger.py b/Examples/Tests/qed/analysis_schwinger.py similarity index 97% rename from Examples/Tests/qed/schwinger/analysis_schwinger.py rename to Examples/Tests/qed/analysis_schwinger.py index c93c920216f..1f430d15158 100755 --- a/Examples/Tests/qed/schwinger/analysis_schwinger.py +++ b/Examples/Tests/qed/analysis_schwinger.py @@ -41,7 +41,8 @@ Bz_test = 0. # Find which test we are doing -test_number = re.search( 'qed_schwinger([1234])', filename ).group(1) +test_name = os.path.split(os.getcwd())[1] +test_number = re.search( 'qed_schwinger_([1234])', test_name ).group(1) if test_number == '1': # First Schwinger test with "weak" EM field. No pair should be created. Ex_test = 1.e16 diff --git a/Examples/Tests/qed/breit_wheeler/inputs_2d b/Examples/Tests/qed/inputs_2d_base_breit_wheeler similarity index 99% rename from Examples/Tests/qed/breit_wheeler/inputs_2d rename to Examples/Tests/qed/inputs_2d_base_breit_wheeler index 857b3243ac6..201520966c2 100644 --- a/Examples/Tests/qed/breit_wheeler/inputs_2d +++ b/Examples/Tests/qed/inputs_2d_base_breit_wheeler @@ -28,6 +28,7 @@ warpx.do_dive_cleaning = 0 warpx.use_filter = 1 warpx.cfl = 1. # if 1., the time step is set to its CFL limit warpx.serialize_initial_conditions = 1 +warpx.abort_on_warning_threshold = high # Order of particle shape factors algo.particle_shape = 3 diff --git a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d b/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d new file mode 100644 index 00000000000..4c63f5f2899 --- /dev/null +++ b/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_2d_base_breit_wheeler diff --git a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd b/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd new file mode 100644 index 00000000000..f882faff1ba --- /dev/null +++ b/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_2d_base_breit_wheeler + +# test input parameters +diag1.format = openpmd +diag1.openpmd_backend = h5 diff --git a/Examples/Tests/qed/quantum_synchrotron/inputs_2d b/Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d similarity index 99% rename from Examples/Tests/qed/quantum_synchrotron/inputs_2d rename to Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d index 2ac2c782ccd..83d0cee16aa 100644 --- a/Examples/Tests/qed/quantum_synchrotron/inputs_2d +++ b/Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d @@ -28,6 +28,7 @@ warpx.do_dive_cleaning = 0 warpx.use_filter = 1 warpx.cfl = 1. # if 1., the time step is set to its CFL limit warpx.serialize_initial_conditions = 1 +warpx.abort_on_warning_threshold = high # Order of particle shape factors algo.particle_shape = 3 diff --git a/Examples/Tests/qed/breit_wheeler/inputs_3d b/Examples/Tests/qed/inputs_3d_base_breit_wheeler similarity index 100% rename from Examples/Tests/qed/breit_wheeler/inputs_3d rename to Examples/Tests/qed/inputs_3d_base_breit_wheeler diff --git a/Examples/Tests/qed/schwinger/inputs_3d_schwinger b/Examples/Tests/qed/inputs_3d_base_schwinger similarity index 100% rename from Examples/Tests/qed/schwinger/inputs_3d_schwinger rename to Examples/Tests/qed/inputs_3d_base_schwinger diff --git a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d b/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d new file mode 100644 index 00000000000..d60d57e4c5f --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base_breit_wheeler diff --git a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd b/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd new file mode 100644 index 00000000000..da68c52c917 --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base_breit_wheeler + +# test input parameters +diag1.format = openpmd +diag1.openpmd_backend = h5 diff --git a/Examples/Tests/qed/quantum_synchrotron/inputs_3d b/Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d similarity index 99% rename from Examples/Tests/qed/quantum_synchrotron/inputs_3d rename to Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d index 429666ef938..87ffd746ec8 100644 --- a/Examples/Tests/qed/quantum_synchrotron/inputs_3d +++ b/Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d @@ -28,6 +28,7 @@ warpx.do_dive_cleaning = 0 warpx.use_filter = 1 warpx.cfl = 1. # if 1., the time step is set to its CFL limit warpx.serialize_initial_conditions = 1 +warpx.abort_on_warning_threshold = high # Order of particle shape factors algo.particle_shape = 3 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 new file mode 100644 index 00000000000..96217d7b537 --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_3d_base_schwinger + +# test input parameters +warpx.B_external_grid = 16792888.570516706 5256650.141557486 18363530.799561853 +warpx.E_external_grid = 1.e16 0 0 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 new file mode 100644 index 00000000000..e27bf1b4239 --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_3d_base_schwinger + +# test input parameters +warpx.B_external_grid = 1679288857.0516706 525665014.1557486 1836353079.9561853 +warpx.E_external_grid = 1.e18 0 0 +qed_schwinger.xmin = -2.5e-7 +qed_schwinger.xmax = 2.49e-7 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 new file mode 100644 index 00000000000..e2e727d1dad --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base_schwinger + +# test input parameters +warpx.E_external_grid = 0 1.090934525450495e+17 0 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 new file mode 100644 index 00000000000..d122a0bf66e --- /dev/null +++ b/Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 @@ -0,0 +1,8 @@ +# base input parameters +FILE = inputs_3d_base_schwinger + +# test input parameters +warpx.B_external_grid = 0 833910140000. 0 +warpx.E_external_grid = 0 0 2.5e+20 +qed_schwinger.ymin = -2.5e-7 +qed_schwinger.zmax = 2.49e-7 diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt new file mode 100644 index 00000000000..bb61ab1ce92 --- /dev/null +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# radiation_reaction ########################################################## +# +add_warpx_test( + radiation_reaction # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction # inputs + Examples/Tests/radiation_reaction/analysis.py # analysis + diags/diag1000064 # output +) diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/analysis_classicalRR.py b/Examples/Tests/radiation_reaction/analysis.py similarity index 100% rename from Examples/Tests/radiation_reaction/test_const_B_analytical/analysis_classicalRR.py rename to Examples/Tests/radiation_reaction/analysis.py diff --git a/Examples/Tests/radiation_reaction/test_const_B_analytical/inputs_3d b/Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction similarity index 100% rename from Examples/Tests/radiation_reaction/test_const_B_analytical/inputs_3d rename to Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt new file mode 100644 index 00000000000..5191b9559e1 --- /dev/null +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# relativistic_space_charge_initialization #################################### +# +add_warpx_test( + relativistic_space_charge_initialization # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization # inputs + Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/relativistic_space_charge_initialization/inputs_3d b/Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization similarity index 100% rename from Examples/Tests/relativistic_space_charge_initialization/inputs_3d rename to Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt new file mode 100644 index 00000000000..2efc78eab74 --- /dev/null +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# repelling_particles ######################################################### +# +add_warpx_test( + repelling_particles # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles # inputs + Examples/Tests/repelling_particles/analysis.py # analysis + diags/diag1000200 # output +) diff --git a/Examples/Tests/repelling_particles/analysis_repelling.py b/Examples/Tests/repelling_particles/analysis.py similarity index 100% rename from Examples/Tests/repelling_particles/analysis_repelling.py rename to Examples/Tests/repelling_particles/analysis.py diff --git a/Examples/Tests/repelling_particles/inputs_2d b/Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles similarity index 100% rename from Examples/Tests/repelling_particles/inputs_2d rename to Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt new file mode 100644 index 00000000000..4888ac167b0 --- /dev/null +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -0,0 +1,38 @@ +# Add tests (alphabetical order) ############################################## +# + +# leveling_thinning ########################################################### +# +add_warpx_test( + leveling_thinning # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/resampling/inputs_2d_test_leveling_thinning # inputs + Examples/Tests/resampling/analysis.py # analysis + diags/diag1000008 # output +) + +# resample_velocity_coincidence_thinning ###################################### +# +add_warpx_test( + resample_velocity_coincidence_thinning # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Tests/resampling/inputs_2d_test_resample_velocity_coincidence_thinning # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000004 # output +) + +# resample_velocity_coincidence_thinning_cartesian ############################ +# +add_warpx_test( + resample_velocity_coincidence_thinning_cartesian # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Tests/resampling/inputs_2d_test_resample_velocity_coincidence_thinning_cartesian # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000004 # output +) diff --git a/Examples/Tests/resampling/analysis_leveling_thinning.py b/Examples/Tests/resampling/analysis.py similarity index 100% rename from Examples/Tests/resampling/analysis_leveling_thinning.py rename to Examples/Tests/resampling/analysis.py diff --git a/Examples/Tests/resampling/inputs_1d_velocity_coincidence_thinning b/Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning similarity index 100% rename from Examples/Tests/resampling/inputs_1d_velocity_coincidence_thinning rename to Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning diff --git a/Examples/Tests/resampling/inputs_1d_velocity_coincidence_thinning_cartesian b/Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning_cartesian similarity index 100% rename from Examples/Tests/resampling/inputs_1d_velocity_coincidence_thinning_cartesian rename to Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning_cartesian diff --git a/Examples/Tests/resampling/inputs_leveling_thinning b/Examples/Tests/resampling/inputs_2d_test_leveling_thinning similarity index 100% rename from Examples/Tests/resampling/inputs_leveling_thinning rename to Examples/Tests/resampling/inputs_2d_test_leveling_thinning diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt new file mode 100644 index 00000000000..98495c4253f --- /dev/null +++ b/Examples/Tests/restart/CMakeLists.txt @@ -0,0 +1,107 @@ +# Add tests (alphabetical order) ############################################## +# + +# id_cpu_read_picmi ########################################################### +# +add_warpx_test( + id_cpu_read_picmi # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# FIXME +# restart_runtime_components_picmi ############################################ +# +#add_warpx_test( +# restart_runtime_components_picmi # name +# 2 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py # inputs +# Examples/analysis_default_regression.py # analysis +# diags/diag1000010 # output +#) + +# acceleration ################################################################ +# +add_warpx_test( + acceleration # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# acceleration_restart ######################################################## +# +add_warpx_test( + acceleration_restart # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# acceleration_psatd ########################################################## +# +if(WarpX_FFT) + add_warpx_test( + acceleration_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration_psatd # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output + ) +endif() + +# acceleration_psatd_restart ################################################## +# +if(WarpX_FFT) + add_warpx_test( + acceleration_psatd_restart # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output + ) +endif() + +# acceleration_psatd_time_avg ################################################# +# +if(WarpX_FFT) + add_warpx_test( + acceleration_psatd_time_avg # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output + ) +endif() + +# acceleration_psatd_time_avg_restart ######################################### +# +if(WarpX_FFT) + add_warpx_test( + acceleration_psatd_time_avg_restart # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output + ) +endif() diff --git a/Examples/Tests/restart/analysis_restart.py b/Examples/Tests/restart/analysis_restart.py deleted file mode 100755 index 1a5b1374672..00000000000 --- a/Examples/Tests/restart/analysis_restart.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys - -sys.path.insert(1, '../../../../warpx/Regression/Checksum/') -import checksumAPI - -filename = sys.argv[1] - -# Check restart data v. original data -sys.path.insert(0, '../../../../warpx/Examples/') -from analysis_default_restart import check_restart - -check_restart(filename) - -# Check-sum analysis -filename = sys.argv[1] -test_name = os.path.split(os.getcwd())[1] -checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/restart/PICMI_inputs_id_cpu_read.py b/Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py similarity index 95% rename from Examples/Tests/restart/PICMI_inputs_id_cpu_read.py rename to Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py index d400924a378..b61fb804b88 100755 --- a/Examples/Tests/restart/PICMI_inputs_id_cpu_read.py +++ b/Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py @@ -65,16 +65,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 10, - write_dir = '.', - warpx_file_prefix = f'Python_restart_runtime_components_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 10, data_list = ['phi'], - write_dir = '.', - warpx_file_prefix = f'Python_restart_runtime_components_plt' ) checkpoint = picmi.Checkpoint( diff --git a/Examples/Tests/restart/PICMI_inputs_runtime_component_analyze.py b/Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py similarity index 100% rename from Examples/Tests/restart/PICMI_inputs_runtime_component_analyze.py rename to Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py diff --git a/Examples/Tests/restart/inputs b/Examples/Tests/restart/inputs_3d_base similarity index 99% rename from Examples/Tests/restart/inputs rename to Examples/Tests/restart/inputs_3d_base index f6aef120466..6724bae64b3 100644 --- a/Examples/Tests/restart/inputs +++ b/Examples/Tests/restart/inputs_3d_base @@ -1,7 +1,6 @@ ################################# ####### GENERAL PARAMETERS ###### ################################# -#amr.restart = diags/chk00005/ max_step = 10 amr.n_cell = 32 32 256 amr.max_grid_size = 64 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration b/Examples/Tests/restart/inputs_3d_test_acceleration new file mode 100644 index 00000000000..287576a9c7f --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd new file mode 100644 index 00000000000..7ca600bee13 --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd @@ -0,0 +1,11 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.maxwell_solver = psatd +boundary.field_hi = periodic periodic damped +boundary.field_lo = periodic periodic damped +particles.use_fdtd_nci_corr = 0 +psatd.current_correction = 0 +psatd.use_default_v_galilean = 1 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart new file mode 100644 index 00000000000..e39fa48f886 --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_test_acceleration_psatd + +# test input parameters +amr.restart = ../acceleration_psatd/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg new file mode 100644 index 00000000000..7ae6037ea15 --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg @@ -0,0 +1,12 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.maxwell_solver = psatd +boundary.field_hi = periodic periodic damped +boundary.field_lo = periodic periodic damped +particles.use_fdtd_nci_corr = 0 +psatd.current_correction = 0 +psatd.do_time_averaging = 1 +psatd.use_default_v_galilean = 1 +warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart new file mode 100644 index 00000000000..1a9946f2af6 --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_test_acceleration_psatd_time_avg + +# test input parameters +amr.restart = ../acceleration_psatd_time_avg/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_restart new file mode 100644 index 00000000000..892b004bba2 --- /dev/null +++ b/Examples/Tests/restart/inputs_3d_test_acceleration_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_test_acceleration + +# test input parameters +amr.restart = ../acceleration/diags/chk000005 diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt new file mode 100644 index 00000000000..7a9ce73a31a --- /dev/null +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -0,0 +1,26 @@ +# Add tests (alphabetical order) ############################################## +# + +# rigid_injection_btd ######################################################### +# +add_warpx_test( + rigid_injection_btd # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd # inputs + Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis + diags/diag1000001 # output +) + +# rigid_injection_lab ######################################################### +# +add_warpx_test( + rigid_injection_lab # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab # inputs + Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis + diags/diag1000289 # output +) diff --git a/Examples/Tests/rigid_injection/analysis_rigid_injection_BoostedFrame.py b/Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py similarity index 100% rename from Examples/Tests/rigid_injection/analysis_rigid_injection_BoostedFrame.py rename to Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py diff --git a/Examples/Tests/rigid_injection/analysis_rigid_injection_LabFrame.py b/Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py similarity index 100% rename from Examples/Tests/rigid_injection/analysis_rigid_injection_LabFrame.py rename to Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py diff --git a/Examples/Tests/rigid_injection/inputs_2d_BoostedFrame b/Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd similarity index 100% rename from Examples/Tests/rigid_injection/inputs_2d_BoostedFrame rename to Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd diff --git a/Examples/Tests/rigid_injection/inputs_2d_LabFrame b/Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab similarity index 100% rename from Examples/Tests/rigid_injection/inputs_2d_LabFrame rename to Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt new file mode 100644 index 00000000000..a90a0873636 --- /dev/null +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -0,0 +1,30 @@ +# Add tests (alphabetical order) ############################################## +# + +# scraping #################################################################### +# +if(WarpX_EB) + add_warpx_test( + scraping # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/scraping/inputs_rz_test_scraping # inputs + Examples/Tests/scraping/analysis_rz.py # analysis + diags/diag1000037 # output + ) +endif() + +# scraping_filter ############################################################# +# +if(WarpX_EB) + add_warpx_test( + scraping_filter # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/scraping/inputs_rz_test_scraping_filter # inputs + Examples/Tests/scraping/analysis_rz_filter.py # analysis + diags/diag1000037 # output + ) +endif() diff --git a/Examples/Tests/scraping/inputs_rz b/Examples/Tests/scraping/inputs_rz_test_scraping similarity index 97% rename from Examples/Tests/scraping/inputs_rz rename to Examples/Tests/scraping/inputs_rz_test_scraping index 0dab9ebedd2..b332de2229a 100644 --- a/Examples/Tests/scraping/inputs_rz +++ b/Examples/Tests/scraping/inputs_rz_test_scraping @@ -21,6 +21,7 @@ boundary.potential_hi_y = 0 boundary.potential_lo_z = 0 boundary.potential_hi_z = 0 +warpx.abort_on_warning_threshold = medium warpx.const_dt = 1.216119097e-11 warpx.eb_implicit_function = "-(x**2-0.1**2)" diff --git a/Examples/Tests/scraping/inputs_rz_filter b/Examples/Tests/scraping/inputs_rz_test_scraping_filter similarity index 97% rename from Examples/Tests/scraping/inputs_rz_filter rename to Examples/Tests/scraping/inputs_rz_test_scraping_filter index 0d67fb96f6c..3a3ab78a226 100644 --- a/Examples/Tests/scraping/inputs_rz_filter +++ b/Examples/Tests/scraping/inputs_rz_test_scraping_filter @@ -21,6 +21,7 @@ boundary.potential_hi_y = 0 boundary.potential_lo_z = 0 boundary.potential_hi_z = 0 +warpx.abort_on_warning_threshold = medium warpx.const_dt = 1.216119097e-11 warpx.eb_implicit_function = "-(x**2-0.1**2)" diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt new file mode 100644 index 00000000000..fece6d65763 --- /dev/null +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -0,0 +1,50 @@ +# Add tests (alphabetical order) ############################################## +# + +# silver_mueller_1d ########################################################### +# +add_warpx_test( + silver_mueller_1d # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d # inputs + Examples/Tests/silver_mueller/analysis.py # analysis + diags/diag1000500 # output +) + +# silver_mueller_2d_x ######################################################### +# +add_warpx_test( + silver_mueller_2d_x # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x # inputs + Examples/Tests/silver_mueller/analysis.py # analysis + diags/diag1000500 # output +) + +# silver_mueller_2d_z ######################################################### +# +add_warpx_test( + silver_mueller_2d_z # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z # inputs + Examples/Tests/silver_mueller/analysis.py # analysis + diags/diag1000500 # output +) + +# silver_mueller_rz_z ######################################################### +# +add_warpx_test( + silver_mueller_rz_z # name + RZ # dims + 2 # nprocs + OFF # eb + Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z # inputs + Examples/Tests/silver_mueller/analysis.py # analysis + diags/diag1000500 # output +) diff --git a/Examples/Tests/silver_mueller/analysis_silver_mueller.py b/Examples/Tests/silver_mueller/analysis.py similarity index 100% rename from Examples/Tests/silver_mueller/analysis_silver_mueller.py rename to Examples/Tests/silver_mueller/analysis.py diff --git a/Examples/Tests/silver_mueller/inputs_1d b/Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d similarity index 100% rename from Examples/Tests/silver_mueller/inputs_1d rename to Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d diff --git a/Examples/Tests/silver_mueller/inputs_2d_x b/Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x similarity index 100% rename from Examples/Tests/silver_mueller/inputs_2d_x rename to Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x diff --git a/Examples/Tests/silver_mueller/inputs_2d_z b/Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z similarity index 100% rename from Examples/Tests/silver_mueller/inputs_2d_z rename to Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z diff --git a/Examples/Tests/silver_mueller/inputs_rz_z b/Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z similarity index 100% rename from Examples/Tests/silver_mueller/inputs_rz_z rename to Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt new file mode 100644 index 00000000000..a1dfdcc7362 --- /dev/null +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -0,0 +1,26 @@ +# Add tests (alphabetical order) ############################################## +# + +# space_charge_initialization_2d ############################################## +# +add_warpx_test( + space_charge_initialization_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d # inputs + Examples/Tests/space_charge_initialization/analysis.py # analysis + diags/diag1000001 # output +) + +# space_charge_initialization_3d ############################################## +# +add_warpx_test( + space_charge_initialization_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d # inputs + Examples/Tests/space_charge_initialization/analysis.py # analysis + diags/diag1000001 # output +) diff --git a/Examples/Tests/space_charge_initialization/inputs_3d b/Examples/Tests/space_charge_initialization/inputs_3d_base similarity index 100% rename from Examples/Tests/space_charge_initialization/inputs_3d rename to Examples/Tests/space_charge_initialization/inputs_3d_base diff --git a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d new file mode 100644 index 00000000000..a02b4f1d2cd --- /dev/null +++ b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +geometry.dims = 2 diff --git a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d new file mode 100644 index 00000000000..287576a9c7f --- /dev/null +++ b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt new file mode 100644 index 00000000000..dc4bee4fad8 --- /dev/null +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# subcycling_mr ############################################################### +# +add_warpx_test( + subcycling_mr # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/subcycling/inputs_2d_test_subcycling_mr # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000250 # output +) diff --git a/Examples/Tests/subcycling/inputs_2d b/Examples/Tests/subcycling/inputs_2d_test_subcycling_mr similarity index 100% rename from Examples/Tests/subcycling/inputs_2d rename to Examples/Tests/subcycling/inputs_2d_test_subcycling_mr diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt new file mode 100644 index 00000000000..1e6adf525a4 --- /dev/null +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -0,0 +1,30 @@ +# Add tests (alphabetical order) ############################################## +# + +# vay_deposition_2d ########################################################### +# +if(WarpX_FFT) + add_warpx_test( + vay_deposition_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d # inputs + Examples/Tests/vay_deposition/analysis.py # analysis + diags/diag1000050 # output + ) +endif() + +# vay_deposition_3d ########################################################### +# +if(WarpX_FFT) + add_warpx_test( + vay_deposition_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d # inputs + Examples/Tests/vay_deposition/analysis.py # analysis + diags/diag1000025 # output + ) +endif() diff --git a/Examples/Tests/vay_deposition/inputs_2d b/Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d similarity index 100% rename from Examples/Tests/vay_deposition/inputs_2d rename to Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d diff --git a/Examples/Tests/vay_deposition/inputs_3d b/Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d similarity index 100% rename from Examples/Tests/vay_deposition/inputs_3d rename to Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d diff --git a/Regression/Checksum/benchmarks_json/restart.json b/Regression/Checksum/benchmarks_json/acceleration.json similarity index 100% rename from Regression/Checksum/benchmarks_json/restart.json rename to Regression/Checksum/benchmarks_json/acceleration.json diff --git a/Regression/Checksum/benchmarks_json/restart_psatd.json b/Regression/Checksum/benchmarks_json/acceleration_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/restart_psatd.json rename to Regression/Checksum/benchmarks_json/acceleration_psatd.json diff --git a/Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json b/Regression/Checksum/benchmarks_json/acceleration_psatd_time_avg.json similarity index 100% rename from Regression/Checksum/benchmarks_json/restart_psatd_time_avg.json rename to Regression/Checksum/benchmarks_json/acceleration_psatd_time_avg.json diff --git a/Regression/Checksum/benchmarks_json/Point_of_contact_EB_3d.json b/Regression/Checksum/benchmarks_json/point_of_contact_eb_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Point_of_contact_EB_3d.json rename to Regression/Checksum/benchmarks_json/point_of_contact_eb_3d.json diff --git a/Regression/Checksum/benchmarks_json/Point_of_contact_EB_rz.json b/Regression/Checksum/benchmarks_json/point_of_contact_eb_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Point_of_contact_EB_rz.json rename to Regression/Checksum/benchmarks_json/point_of_contact_eb_rz.json diff --git a/Regression/Checksum/benchmarks_json/Python_wrappers.json b/Regression/Checksum/benchmarks_json/python_wrappers_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_wrappers.json rename to Regression/Checksum/benchmarks_json/python_wrappers_picmi.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger1.json b/Regression/Checksum/benchmarks_json/qed_schwinger_1.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger1.json rename to Regression/Checksum/benchmarks_json/qed_schwinger_1.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger2.json b/Regression/Checksum/benchmarks_json/qed_schwinger_2.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger2.json rename to Regression/Checksum/benchmarks_json/qed_schwinger_2.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger3.json b/Regression/Checksum/benchmarks_json/qed_schwinger_3.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger3.json rename to Regression/Checksum/benchmarks_json/qed_schwinger_3.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger4.json b/Regression/Checksum/benchmarks_json/qed_schwinger_4.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger4.json rename to Regression/Checksum/benchmarks_json/qed_schwinger_4.json diff --git a/Regression/Checksum/benchmarks_json/RepellingParticles.json b/Regression/Checksum/benchmarks_json/repelling_particles.json similarity index 100% rename from Regression/Checksum/benchmarks_json/RepellingParticles.json rename to Regression/Checksum/benchmarks_json/repelling_particles.json diff --git a/Regression/Checksum/benchmarks_json/RigidInjection_BTD.json b/Regression/Checksum/benchmarks_json/rigid_injection_btd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/RigidInjection_BTD.json rename to Regression/Checksum/benchmarks_json/rigid_injection_btd.json diff --git a/Regression/Checksum/benchmarks_json/RigidInjection_lab.json b/Regression/Checksum/benchmarks_json/rigid_injection_lab.json similarity index 100% rename from Regression/Checksum/benchmarks_json/RigidInjection_lab.json rename to Regression/Checksum/benchmarks_json/rigid_injection_lab.json diff --git a/Regression/Checksum/benchmarks_json/space_charge_initialization.json b/Regression/Checksum/benchmarks_json/space_charge_initialization_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/space_charge_initialization.json rename to Regression/Checksum/benchmarks_json/space_charge_initialization_3d.json diff --git a/Regression/Checksum/benchmarks_json/subcyclingMR.json b/Regression/Checksum/benchmarks_json/subcycling_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/subcyclingMR.json rename to Regression/Checksum/benchmarks_json/subcycling_mr.json diff --git a/Regression/Checksum/benchmarks_json/VayDeposition2D.json b/Regression/Checksum/benchmarks_json/vay_deposition_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/VayDeposition2D.json rename to Regression/Checksum/benchmarks_json/vay_deposition_2d.json diff --git a/Regression/Checksum/benchmarks_json/VayDeposition3D.json b/Regression/Checksum/benchmarks_json/vay_deposition_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/VayDeposition3D.json rename to Regression/Checksum/benchmarks_json/vay_deposition_3d.json From c4e49d71624aeea98e6f87916faae0611e7eb32d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 16 Aug 2024 15:22:33 -0700 Subject: [PATCH 083/167] Fix broken tests --- Examples/Tests/collision/CMakeLists.txt | 6 +++--- .../Tests/collision/analysis_collision_2d.py | 10 ++++++++-- .../collision/inputs_2d_test_collision_xz | 1 - .../inputs_2d_test_collision_xz_picmi.py | 4 ---- .../collision/inputs_3d_test_collision_xyz | 1 - .../electrostatic_dirichlet_bc/analysis.py | 4 +--- .../inputs_2d_test_dirichlet_bc | 1 + .../inputs_2d_test_dirichlet_bc_picmi.py | 4 ---- .../inputs_1d_test_semi_implicit_picard_1d | 1 + .../inputs_1d_test_theta_implicit_picard_1d | 1 + Examples/Tests/laser_injection/CMakeLists.txt | 2 +- .../inputs_3d_test_laser_injection_3d | 2 +- .../CMakeLists.txt | 8 ++++---- .../particle_boundary_interaction/analysis.py | 2 +- .../pass_mpi_communicator/CMakeLists.txt | 19 ++++++++++--------- .../inputs_2d_test_python_wrappers_picmi.py | 4 ---- Examples/Tests/resampling/CMakeLists.txt | 4 ++-- ...st_resample_velocity_coincidence_thinning} | 0 ...e_velocity_coincidence_thinning_cartesian} | 0 ...ian_beam.json => gaussian_beam_picmi.json} | 0 ... particle_boundary_interaction_picmi.json} | 0 ...sitions.json => prev_positions_picmi.json} | 0 ...on_2D.json => proton_boron_fusion_2d.json} | 0 ...on_3D.json => proton_boron_fusion_3d.json} | 0 24 files changed, 34 insertions(+), 40 deletions(-) rename Examples/Tests/resampling/{inputs_1d_test_velocity_coincidence_thinning => inputs_1d_test_resample_velocity_coincidence_thinning} (100%) rename Examples/Tests/resampling/{inputs_1d_test_velocity_coincidence_thinning_cartesian => inputs_1d_test_resample_velocity_coincidence_thinning_cartesian} (100%) rename Regression/Checksum/benchmarks_json/{Python_gaussian_beam.json => gaussian_beam_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_boundary_interaction.json => particle_boundary_interaction_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_prev_positions.json => prev_positions_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Proton_Boron_Fusion_2D.json => proton_boron_fusion_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{Proton_Boron_Fusion_3D.json => proton_boron_fusion_3d.json} (100%) diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index ae445f91211..fa6bb90c909 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -46,7 +46,7 @@ add_warpx_test( OFF # eb Examples/Tests/collision/inputs_3d_test_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis - collision_xyz_plt000150 # output + diags/diag1000150 # output ) # collision_xz ################################################################ @@ -58,7 +58,7 @@ add_warpx_test( OFF # eb Examples/Tests/collision/inputs_2d_test_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis - collision_xz_plt000150 # output + diags/diag1000150 # output ) # collision_xz_picmi ########################################################## @@ -70,5 +70,5 @@ add_warpx_test( OFF # eb Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis - collision_xz_plt000150 # output + diags/diag1000150 # output ) diff --git a/Examples/Tests/collision/analysis_collision_2d.py b/Examples/Tests/collision/analysis_collision_2d.py index 8ef251b0ace..a60fe78c331 100755 --- a/Examples/Tests/collision/analysis_collision_2d.py +++ b/Examples/Tests/collision/analysis_collision_2d.py @@ -35,6 +35,8 @@ sys.path.insert(1, '../../../../warpx/Regression/Checksum/') import checksumAPI +test_name = os.path.split(os.getcwd())[1] + tolerance = 0.001 ng = 64 @@ -61,6 +63,11 @@ # Collect all output files in fn_list (names match pattern prefix + arbitrary number) fn_list = glob.glob(prefix + '*[0-9]') +print(last_fn) +print(last_it) +print(prefix) +print(fn_list) + error = 0.0 nt = 0 for fn in fn_list: @@ -86,7 +93,7 @@ # The second part of the analysis is not done for the Python test # since the particle filter function is not accessible from PICMI yet -if "Python" in last_fn: +if "picmi" in test_name: exit() ## In the second part of the test, we verify that the diagnostic particle filter function works as @@ -110,5 +117,4 @@ post_processing_utils.check_random_filter(last_fn, random_filter_fn, random_fraction, dim, species_name) -test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, last_fn) diff --git a/Examples/Tests/collision/inputs_2d_test_collision_xz b/Examples/Tests/collision/inputs_2d_test_collision_xz index f2305f48667..69d23dfb0c0 100644 --- a/Examples/Tests/collision/inputs_2d_test_collision_xz +++ b/Examples/Tests/collision/inputs_2d_test_collision_xz @@ -73,7 +73,6 @@ diagnostics.diags_names = diag1 diag_parser_filter diag_uniform_filter diag_rand diag1.intervals = 10 diag1.diag_type = Full diag1.fields_to_plot = Ex Ey Ez Bx By Bz -diag1.file_prefix = collisionXZ_plt ## diag_parser_filter is a diag used to test the particle filter function. diag_parser_filter.intervals = 150:150: diff --git a/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py b/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py index cbbd6959dab..8848d5d0050 100755 --- a/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py +++ b/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py @@ -109,16 +109,12 @@ particle_diag = picmi.ParticleDiagnostic( name='diag1', period=10, - write_dir='.', - warpx_file_prefix='collision_xz_picmi_plt' ) field_diag = picmi.FieldDiagnostic( name='diag1', grid=grid, period=10, data_list=[], - write_dir='.', - warpx_file_prefix='collision_xz_picmi_plt' ) ################################# diff --git a/Examples/Tests/collision/inputs_3d_test_collision_xyz b/Examples/Tests/collision/inputs_3d_test_collision_xyz index 8aa0fc3fb7b..11d6b150dd2 100644 --- a/Examples/Tests/collision/inputs_3d_test_collision_xyz +++ b/Examples/Tests/collision/inputs_3d_test_collision_xyz @@ -77,7 +77,6 @@ diagnostics.diags_names = diag1 diag_parser_filter diag_uniform_filter diag_rand diag1.intervals = 10 diag1.diag_type = Full diag1.fields_to_plot = Ex Ey Ez Bx By Bz T_electron T_ion -diag1.file_prefix = collisionXYZ_plt ## diag_parser_filter is a diag used to test the particle filter function. diag_parser_filter.intervals = 150:150: diff --git a/Examples/Tests/electrostatic_dirichlet_bc/analysis.py b/Examples/Tests/electrostatic_dirichlet_bc/analysis.py index eae2f17243c..a9a8258f286 100755 --- a/Examples/Tests/electrostatic_dirichlet_bc/analysis.py +++ b/Examples/Tests/electrostatic_dirichlet_bc/analysis.py @@ -18,9 +18,7 @@ import numpy as np import yt -files = sorted(glob.glob('dirichletbc_plt*'))[1:] -if len(files) == 0: - files = sorted(glob.glob('Python_dirichletbc_plt*'))[1:] +files = sorted(glob.glob('diags/diag1*'))[1:] assert len(files) > 0 times = np.ones(len(files)) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc index d501dac7d0c..46b00819926 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc +++ b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc @@ -1,5 +1,6 @@ max_step = 100 warpx.verbose = 0 +warpx.abort_on_warning_threshold = medium warpx.const_dt = 7.5e-10 warpx.do_electrostatic = labframe warpx.self_fields_required_precision = 1e-06 diff --git a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py index e4dd530c3bc..26be55b2957 100755 --- a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py +++ b/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py @@ -61,16 +61,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 4, - write_dir = '.', - warpx_file_prefix = 'Python_dirichletbc_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 4, data_list = ['phi'], - write_dir = '.', - warpx_file_prefix = 'Python_dirichletbc_plt' ) ########################## diff --git a/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d b/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d index ad339287df2..8ef0304bebb 100644 --- a/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d +++ b/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d @@ -17,6 +17,7 @@ my_constants.dt = 0.1/wpe # time step size, s max_step = 100 amr.n_cell = nz +amr.max_grid_size = 32 amr.max_level = 0 geometry.dims = 1 diff --git a/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d b/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d index 211495e1f1e..2ed4d746708 100644 --- a/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d +++ b/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d @@ -17,6 +17,7 @@ my_constants.dt = 0.1/wpe # time step size, s max_step = 100 amr.n_cell = nz +amr.max_grid_size = 32 amr.max_level = 0 geometry.dims = 1 diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index 6879124e0d3..66850b74370 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -34,5 +34,5 @@ add_warpx_test( OFF # eb Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis - diags/diag1001000 # output + diags/diag1000020 # output ) diff --git a/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d b/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d index 72464f86aaf..250a0160881 100644 --- a/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d +++ b/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d @@ -1,5 +1,5 @@ # Maximum number of time steps -max_step = 1000 +max_step = 20 # number of grid points amr.n_cell = 32 32 240 diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index 9b42503ed16..1fe096f996e 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -1,14 +1,14 @@ # Add tests (alphabetical order) ############################################## # -# particle_boundary_interaction ############################################### +# particle_boundary_interaction_picmi ######################################### # add_warpx_test( - particle_boundary_interaction # name + particle_boundary_interaction_picmi # name RZ # dims 2 # nprocs - OFF # eb + ON # eb Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis - diags/diag1000023 # output + diags/diag1/ # output ) diff --git a/Examples/Tests/particle_boundary_interaction/analysis.py b/Examples/Tests/particle_boundary_interaction/analysis.py index ff83cc1fed7..48aa43ca1d9 100755 --- a/Examples/Tests/particle_boundary_interaction/analysis.py +++ b/Examples/Tests/particle_boundary_interaction/analysis.py @@ -23,7 +23,7 @@ test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename, output_format='openpmd') -ts = OpenPMDTimeSeries('./particle_boundary_interaction_plt') +ts = OpenPMDTimeSeries(filename) it=ts.iterations x,y,z=ts.get_particle(['x','y','z'], species='electrons', iteration=it[-1]) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index 671c9714002..ede6abb528e 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -1,14 +1,15 @@ # Add tests (alphabetical order) ############################################## # +# FIXME # pass_mpi_comm_picmi ######################################################### # -add_warpx_test( - pass_mpi_comm_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py # inputs - Examples/Tests/pass_mpi_communicator/analysis.py # analysis - diags/diag1000010 # output -) +#add_warpx_test( +# pass_mpi_comm_picmi # name +# 2 # dims +# 2 # nprocs +# OFF # eb +# Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py # inputs +# Examples/Tests/pass_mpi_communicator/analysis.py # analysis +# diags/diag1000010 # output +#) diff --git a/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py b/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py index db1cc7dcad8..d57c3a2efb8 100755 --- a/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py +++ b/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py @@ -64,14 +64,10 @@ diag_field_list = ["E", "B"] particle_diag = picmi.ParticleDiagnostic(name = 'diag1', period = 10, - write_dir = '.', - warpx_file_prefix = 'Python_wrappers_plt', data_list = diag_field_list) field_diag = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = 10, - write_dir = '.', - warpx_file_prefix = 'Python_wrappers_plt', data_list = diag_field_list) # Initialize simulation diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index 4888ac167b0..d8aabdb297d 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -20,7 +20,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_2d_test_resample_velocity_coincidence_thinning # inputs + Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output ) @@ -32,7 +32,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_2d_test_resample_velocity_coincidence_thinning_cartesian # inputs + Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output ) diff --git a/Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning b/Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning similarity index 100% rename from Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning rename to Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning diff --git a/Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning_cartesian b/Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian similarity index 100% rename from Examples/Tests/resampling/inputs_1d_test_velocity_coincidence_thinning_cartesian rename to Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian diff --git a/Regression/Checksum/benchmarks_json/Python_gaussian_beam.json b/Regression/Checksum/benchmarks_json/gaussian_beam_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_gaussian_beam.json rename to Regression/Checksum/benchmarks_json/gaussian_beam_picmi.json diff --git a/Regression/Checksum/benchmarks_json/particle_boundary_interaction.json b/Regression/Checksum/benchmarks_json/particle_boundary_interaction_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_boundary_interaction.json rename to Regression/Checksum/benchmarks_json/particle_boundary_interaction_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_prev_positions.json b/Regression/Checksum/benchmarks_json/prev_positions_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_prev_positions.json rename to Regression/Checksum/benchmarks_json/prev_positions_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Proton_Boron_Fusion_2D.json b/Regression/Checksum/benchmarks_json/proton_boron_fusion_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Proton_Boron_Fusion_2D.json rename to Regression/Checksum/benchmarks_json/proton_boron_fusion_2d.json diff --git a/Regression/Checksum/benchmarks_json/Proton_Boron_Fusion_3D.json b/Regression/Checksum/benchmarks_json/proton_boron_fusion_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Proton_Boron_Fusion_3D.json rename to Regression/Checksum/benchmarks_json/proton_boron_fusion_3d.json From c41c10942247776f60ec7a44e856a249bedb42ae Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 09:55:19 -0700 Subject: [PATCH 084/167] Fix broken tests --- .../particle_boundary_process/analysis_absorption.py | 6 ++++-- .../Tests/particle_boundary_scrape/analysis_scrape.py | 11 +++-------- Examples/Tests/point_of_contact_eb/CMakeLists.txt | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Examples/Tests/particle_boundary_process/analysis_absorption.py b/Examples/Tests/particle_boundary_process/analysis_absorption.py index 9029cc60214..b6923b92ec6 100755 --- a/Examples/Tests/particle_boundary_process/analysis_absorption.py +++ b/Examples/Tests/particle_boundary_process/analysis_absorption.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 +import sys import yt # This test shoots a beam of electrons at cubic embedded boundary geometry @@ -9,11 +10,12 @@ # the problem domain yet. # all particles are still there -ds40 = yt.load("particle_absorption_plt000040") +ds40 = yt.load("diags/diag1000040") np40 = ds40.index.particle_headers['electrons'].num_particles assert(np40 == 612) # all particles have been removed -ds60 = yt.load("particle_absorption_plt000060") +filename = sys.argv[1] +ds60 = yt.load(filename) np60 = ds60.index.particle_headers['electrons'].num_particles assert(np60 == 0) diff --git a/Examples/Tests/particle_boundary_scrape/analysis_scrape.py b/Examples/Tests/particle_boundary_scrape/analysis_scrape.py index bf1de62bf0f..a0e55f78582 100755 --- a/Examples/Tests/particle_boundary_scrape/analysis_scrape.py +++ b/Examples/Tests/particle_boundary_scrape/analysis_scrape.py @@ -2,6 +2,7 @@ from pathlib import Path +import sys import yt # This test shoots a beam of electrons at cubic embedded boundary geometry @@ -11,19 +12,13 @@ # the problem domain yet. # all particles are still there -if Path("particle_scrape_plt000040").is_dir(): - filename = "particle_scrape_plt000040" -else: - filename = "Python_particle_scrape_plt000040" +filename = "diags/diag1000040" ds40 = yt.load(filename) np40 = ds40.index.particle_headers['electrons'].num_particles assert(np40 == 612) # all particles have been removed -if Path("particle_scrape_plt000060").is_dir(): - filename = "particle_scrape_plt000060" -else: - filename = "Python_particle_scrape_plt000060" +filename = sys.argv[1] ds60 = yt.load(filename) np60 = ds60.index.particle_headers['electrons'].num_particles assert(np60 == 0) diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index e7dcef059f8..cb7a754cdc5 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -11,7 +11,7 @@ if(WarpX_EB) ON # eb Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis - diags/diag1000003 # output + diags/diag1/ # output ) endif() @@ -25,6 +25,6 @@ if(WarpX_EB) ON # eb Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis - diags/diag1000003 # output + diags/diag1/ # output ) endif() From ccd3e052cb142fdd1c8db5669cdc585e77a4a089 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:55:32 +0000 Subject: [PATCH 085/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Examples/Tests/particle_boundary_process/analysis_absorption.py | 1 + Examples/Tests/particle_boundary_scrape/analysis_scrape.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Tests/particle_boundary_process/analysis_absorption.py b/Examples/Tests/particle_boundary_process/analysis_absorption.py index b6923b92ec6..07aee1fbe82 100755 --- a/Examples/Tests/particle_boundary_process/analysis_absorption.py +++ b/Examples/Tests/particle_boundary_process/analysis_absorption.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import sys + import yt # This test shoots a beam of electrons at cubic embedded boundary geometry diff --git a/Examples/Tests/particle_boundary_scrape/analysis_scrape.py b/Examples/Tests/particle_boundary_scrape/analysis_scrape.py index a0e55f78582..914138f35e6 100755 --- a/Examples/Tests/particle_boundary_scrape/analysis_scrape.py +++ b/Examples/Tests/particle_boundary_scrape/analysis_scrape.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -from pathlib import Path import sys + import yt # This test shoots a beam of electrons at cubic embedded boundary geometry From 5786d3c0853a65411f458ed222d37cedea7b66dc Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 10:30:32 -0700 Subject: [PATCH 086/167] Fix broken tests --- Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py index ea0f323f722..ec2a7c04a96 100755 --- a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py +++ b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py @@ -6,6 +6,7 @@ # License: BSD-3-Clause-LBNL import os +import re import sys import yt @@ -80,7 +81,8 @@ E_fusion_total = E_fusion + E_decay # Energy released during p + B -> 3*alpha ## Checks whether this is the 2D or the 3D test -is_2D = "2D" in sys.argv[1] +warpx_used_inputs = open('./warpx_used_inputs', 'r').read() +is_2D = re.search('geometry.dims\s*=\s*2', warpx_used_inputs) ## Some numerical parameters for this test size_x = 8 From 406bc7ce337a54cad7c985f912840ada4fb39c49 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 10:34:48 -0700 Subject: [PATCH 087/167] Add default AMReX CMake flags --- .azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 415e9f688e1..35fef4e92c1 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -18,6 +18,7 @@ jobs: FFTW_HOME: '/usr' LAPACKPP_HOME: '/usr/local' #OMP_NUM_THREADS: 1 + AMReX_CMAKE_FLAGS: '-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON' WARPX_CI_CCACHE: 'TRUE' #WARPX_CI_NUM_MAKE_JOBS: 2 #WARPX_CI_OPENPMD: 'TRUE' @@ -149,7 +150,7 @@ jobs: set -eu -o pipefail df -h # configure - cmake -S . -B build ${WARPX_CMAKE_FLAGS} + cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) From b071143b8d430dc9d0117f15229fb8bef89d9410 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 11:23:21 -0700 Subject: [PATCH 088/167] Add more tests --- Examples/Physics_applications/CMakeLists.txt | 1 + .../laser_acceleration/CMakeLists.txt | 120 ++++++++++++++++++ ...ysis_1d_fluids.py => analysis_1d_fluid.py} | 0 ...oosted.py => analysis_1d_fluid_boosted.py} | 0 .../laser_acceleration/analysis_openpmd_rz.py | 5 +- ...d => inputs_1d_test_laser_acceleration_1d} | 0 ...nputs_1d_test_laser_acceleration_1d_fluid} | 0 ..._test_laser_acceleration_1d_fluid_boosted} | 0 .../{inputs_2d => inputs_2d_base} | 0 ...uts_2d_test_laser_acceleration_2d_boosted} | 4 +- .../inputs_2d_test_laser_acceleration_2d_mr | 2 + .../inputs_2d_test_refined_injection | 6 + .../{inputs_3d => inputs_3d_base} | 0 .../inputs_3d_test_laser_acceleration_3d | 2 + ...ser_acceleration_3d_single_precision_comms | 5 + .../{inputs_rz => inputs_rz_base} | 0 .../inputs_rz_test_laser_acceleration_rz | 6 + .../inputs_rz_test_laser_acceleration_rz_opmd | 9 ++ .../laser_ion/CMakeLists.txt | 26 ++++ ...uts_2d => inputs_2d_test_laser_ion_acc_2d} | 0 ... inputs_2d_test_laser_ion_acc_2d_picmi.py} | 8 +- Examples/Tests/CMakeLists.txt | 1 + .../CMakeLists.txt | 2 +- Examples/Tests/field_probe/CMakeLists.txt | 16 +++ .../{inputs_2d => inputs_2d_test_field_probe} | 0 .../CMakeLists.txt | 20 +-- ...ion_1d.json => laser_acceleration_1d.json} | 0 ....json => laser_acceleration_1d_fluid.json} | 0 ... laser_acceleration_1d_fluid_boosted.json} | 0 ...son => laser_acceleration_2d_boosted.json} | 0 ...nMR.json => laser_acceleration_2d_mr.json} | 0 ...ration.json => laser_acceleration_3d.json} | 0 ...celeration_3d_single_precision_comms.json} | 0 ...tionRZ.json => laser_acceleration_rz.json} | 0 ...serIonAcc2d.json => laser_ion_acc_2d.json} | 0 ...Acc2d.json => laser_ion_acc_2d_picmi.json} | 0 ...dInjection.json => refined_injection.json} | 0 37 files changed, 214 insertions(+), 19 deletions(-) rename Examples/Physics_applications/laser_acceleration/{analysis_1d_fluids.py => analysis_1d_fluid.py} (100%) rename Examples/Physics_applications/laser_acceleration/{analysis_1d_fluids_boosted.py => analysis_1d_fluid_boosted.py} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d => inputs_1d_test_laser_acceleration_1d} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_fluids => inputs_1d_test_laser_acceleration_1d_fluid} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_fluids_boosted => inputs_1d_test_laser_acceleration_1d_fluid_boosted} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d => inputs_2d_base} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d_boost => inputs_2d_test_laser_acceleration_2d_boosted} (98%) create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection rename Examples/Physics_applications/laser_acceleration/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms rename Examples/Physics_applications/laser_acceleration/{inputs_rz => inputs_rz_base} (100%) create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz create mode 100644 Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd create mode 100644 Examples/Physics_applications/laser_ion/CMakeLists.txt rename Examples/Physics_applications/laser_ion/{inputs_2d => inputs_2d_test_laser_ion_acc_2d} (100%) rename Examples/Physics_applications/laser_ion/{PICMI_inputs_2d.py => inputs_2d_test_laser_ion_acc_2d_picmi.py} (98%) create mode 100644 Examples/Tests/field_probe/CMakeLists.txt rename Examples/Tests/field_probe/{inputs_2d => inputs_2d_test_field_probe} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration_1d.json => laser_acceleration_1d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration_1d_fluid.json => laser_acceleration_1d_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration_1d_fluid_boosted.json => laser_acceleration_1d_fluid_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAccelerationBoost.json => laser_acceleration_2d_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAccelerationMR.json => laser_acceleration_2d_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration.json => laser_acceleration_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAcceleration_single_precision_comms.json => laser_acceleration_3d_single_precision_comms.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserAccelerationRZ.json => laser_acceleration_rz.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserIonAcc2d.json => laser_ion_acc_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LaserIonAcc2d.json => laser_ion_acc_2d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{RefinedInjection.json => refined_injection.json} (100%) diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index d333fb15c09..068082f7c40 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(capacitive_discharge) add_subdirectory(laser_acceleration) +add_subdirectory(laser_ion) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 181cc74bab9..4533c82cd31 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -1,6 +1,42 @@ # Add tests (alphabetical order) ############################################## # +# laser_acceleration_1d ####################################################### +# +add_warpx_test( + laser_acceleration_1d # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000100 # output +) + +# laser_acceleration_1d_fluid ################################################# +# +add_warpx_test( + laser_acceleration_1d_fluid # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid # inputs + Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis + diags/diag1040000 # output +) + +# laser_acceleration_1d_fluid_boosted ######################################### +# +add_warpx_test( + laser_acceleration_1d_fluid_boosted # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted # inputs + Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis + diags/diag1000001 # output +) + # laser_acceleration_1d_picmi ################################################# # add_warpx_test( @@ -12,3 +48,87 @@ add_warpx_test( Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) + +# laser_acceleration_2d_boosted ############################################### +# +add_warpx_test( + laser_acceleration_2d_boosted # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000002 # output +) + +# laser_acceleration_2d_mr #################################################### +# +add_warpx_test( + laser_acceleration_2d_mr # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000200 # output +) + +# laser_acceleration_3d ####################################################### +# +add_warpx_test( + laser_acceleration_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d # inputs + Examples/analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output +) + +# laser_acceleration_3d_single_precision_comms ################################ +# +add_warpx_test( + laser_acceleration_3d_single_precision_comms # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms # inputs + Examples/analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output +) + +# laser_acceleration_rz ####################################################### +# +add_warpx_test( + laser_acceleration_rz # name + RZ # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# laser_acceleration_rz_opmd ################################################## +# +add_warpx_test( + laser_acceleration_rz_opmd # name + RZ # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd # inputs + Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis + diags/diag1/ # output +) + +# refined_injection ########################################################### +# +add_warpx_test( + refined_injection # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection # inputs + Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis + diags/diag1000200 # output +) diff --git a/Examples/Physics_applications/laser_acceleration/analysis_1d_fluids.py b/Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/analysis_1d_fluids.py rename to Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py diff --git a/Examples/Physics_applications/laser_acceleration/analysis_1d_fluids_boosted.py b/Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/analysis_1d_fluids_boosted.py rename to Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py diff --git a/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py b/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py index 247c4ac61a0..9f7d2879791 100755 --- a/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py +++ b/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py @@ -1,9 +1,12 @@ #!/usr/bin/env python3 import numpy as np +import sys + import openpmd_api as io -series = io.Series("LaserAccelerationRZ_opmd_plt/openpmd_%T.h5", io.Access.read_only) +filename = sys.argv[1] +series = io.Series(f"{filename}/openpmd_%T.h5", io.Access.read_only) assert len(series.iterations) == 3, 'improper number of iterations stored' diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d b/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d rename to Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_fluids b/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_fluids rename to Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_fluids_boosted b/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_fluids_boosted rename to Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d b/Examples/Physics_applications/laser_acceleration/inputs_2d_base similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_2d rename to Examples/Physics_applications/laser_acceleration/inputs_2d_base diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_boost b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted similarity index 98% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_boost rename to Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted index c2aa92c3634..1997054e885 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_2d_boost +++ b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted @@ -1,9 +1,9 @@ ################################# ######### BOX PARAMETERS ######## ################################# -max_step = 2700 +max_step = 300 #2700 # stop_time = 1.9e-12 -amr.n_cell = 128 1024 +amr.n_cell = 64 512 #128 1024 amr.max_grid_size = 64 amr.blocking_factor = 32 amr.max_level = 0 diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr new file mode 100644 index 00000000000..a9e0a64cbc5 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_2d_base diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection new file mode 100644 index 00000000000..f30c57ca78f --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +amr.ref_ratio_vect = 2 1 +warpx.refine_plasma = 1 diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d b/Examples/Physics_applications/laser_acceleration/inputs_3d_base similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_3d rename to Examples/Physics_applications/laser_acceleration/inputs_3d_base diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d new file mode 100644 index 00000000000..287576a9c7f --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms new file mode 100644 index 00000000000..be35ae541df --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +warpx.do_single_precision_comms = 1 diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz b/Examples/Physics_applications/laser_acceleration/inputs_rz_base similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_rz rename to Examples/Physics_applications/laser_acceleration/inputs_rz_base diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz new file mode 100644 index 00000000000..998b983e736 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz @@ -0,0 +1,6 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +diag1.dump_rz_modes = 1 +warpx.abort_on_warning_threshold = high diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd new file mode 100644 index 00000000000..2c29ed146c4 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd @@ -0,0 +1,9 @@ +# base input parameters +FILE = inputs_rz_base + +# test input parameters +diag1.fields_to_plot = Er Bt Bz jr jt jz rho part_per_cell part_per_grid rho_beam rho_electrons +diag1.format = openpmd +diag1.openpmd_backend = h5 +max_step = 20 +warpx.abort_on_warning_threshold = high diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt new file mode 100644 index 00000000000..24f298ada0b --- /dev/null +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -0,0 +1,26 @@ +# Add tests (alphabetical order) ############################################## +# + +# laser_ion_acc_2d ############################################################ +# +add_warpx_test( + laser_ion_acc_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d # inputs + Examples/analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output +) + +# laser_ion_acc_2d_picmi ###################################################### +# +add_warpx_test( + laser_ion_acc_2d_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py # inputs + Examples/analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output +) diff --git a/Examples/Physics_applications/laser_ion/inputs_2d b/Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d similarity index 100% rename from Examples/Physics_applications/laser_ion/inputs_2d rename to Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d diff --git a/Examples/Physics_applications/laser_ion/PICMI_inputs_2d.py b/Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py similarity index 98% rename from Examples/Physics_applications/laser_ion/PICMI_inputs_2d.py rename to Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py index 9f7a2aacfca..ffd4e15f3a4 100755 --- a/Examples/Physics_applications/laser_ion/PICMI_inputs_2d.py +++ b/Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py @@ -136,9 +136,8 @@ # Diagnostics particle_diag = picmi.ParticleDiagnostic( - name='Python_LaserIonAcc2d_plt', + name='diag1', period=100, - write_dir='./diags', warpx_format='openpmd', warpx_openpmd_backend='h5', # demonstration of a spatial and momentum filter @@ -150,12 +149,11 @@ for (ncell_comp, cr) in zip([nx,nz], coarsening_ratio): ncell_field.append(int(ncell_comp/cr)) field_diag = picmi.FieldDiagnostic( - name='Python_LaserIonAcc2d_plt', + name='diag1', grid=grid, period=100, number_of_cells=ncell_field, data_list=['B', 'E', 'J', 'rho', 'rho_electrons', 'rho_hydrogen'], - write_dir='./diags', warpx_format='openpmd', warpx_openpmd_backend='h5' ) @@ -163,7 +161,6 @@ particle_fw_diag = picmi.ParticleDiagnostic( name='openPMDfw', period=100, - write_dir='./diags', warpx_format='openpmd', warpx_openpmd_backend='h5', warpx_plot_filter_function='(uz>=0) * (x<1.0e-6) * (x>-1.0e-6)' @@ -172,7 +169,6 @@ particle_bw_diag = picmi.ParticleDiagnostic( name='openPMDbw', period=100, - write_dir='./diags', warpx_format='openpmd', warpx_openpmd_backend='h5', warpx_plot_filter_function='(uz<0)' diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index b0dd5fb6800..c4c65a73e10 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -17,6 +17,7 @@ add_subdirectory(embedded_boundary_diffraction) add_subdirectory(embedded_boundary_python_api) add_subdirectory(embedded_boundary_rotated_cube) add_subdirectory(energy_conserving_thermal_plasma) +add_subdirectory(field_probe) add_subdirectory(flux_injection) add_subdirectory(gaussian_beam) add_subdirectory(implicit) diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index d4b349b0ae4..66b56ae524c 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -1,7 +1,7 @@ # Add tests (alphabetical order) ############################################## # -# embedded_boundary_python_api ################################################ +# embedded_boundary_picmi ##################################################### # if(WarpX_EB) add_warpx_test( diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt new file mode 100644 index 00000000000..b6518a6e011 --- /dev/null +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -0,0 +1,16 @@ +# Add tests (alphabetical order) ############################################## +# + +# field_probe ################################################################# +# +if(WarpX_EB) + add_warpx_test( + field_probe # name + 2 # dims + 2 # nprocs + ON # eb + Examples/Tests/field_probe/inputs_2d_test_field_probe # inputs + Examples/Tests/field_probe/analysis_field_probe.py # analysis + diags/diag1000544 # output + ) +endif() diff --git a/Examples/Tests/field_probe/inputs_2d b/Examples/Tests/field_probe/inputs_2d_test_field_probe similarity index 100% rename from Examples/Tests/field_probe/inputs_2d rename to Examples/Tests/field_probe/inputs_2d_test_field_probe diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index 1fe096f996e..2af5675a547 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -3,12 +3,14 @@ # particle_boundary_interaction_picmi ######################################### # -add_warpx_test( - particle_boundary_interaction_picmi # name - RZ # dims - 2 # nprocs - ON # eb - Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs - Examples/Tests/particle_boundary_interaction/analysis.py # analysis - diags/diag1/ # output -) +if(WarpX_EB) + add_warpx_test( + particle_boundary_interaction_picmi # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs + Examples/Tests/particle_boundary_interaction/analysis.py # analysis + diags/diag1/ # output + ) +endif() diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json b/Regression/Checksum/benchmarks_json/laser_acceleration_1d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration_1d.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_1d.json diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_1d_fluid.json b/Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration_1d_fluid.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid.json diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_1d_fluid_boosted.json b/Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration_1d_fluid_boosted.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid_boosted.json diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json b/Regression/Checksum/benchmarks_json/laser_acceleration_2d_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAccelerationBoost.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_2d_boosted.json diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationMR.json b/Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAccelerationMR.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr.json diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration.json b/Regression/Checksum/benchmarks_json/laser_acceleration_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_3d.json diff --git a/Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json b/Regression/Checksum/benchmarks_json/laser_acceleration_3d_single_precision_comms.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAcceleration_single_precision_comms.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_3d_single_precision_comms.json diff --git a/Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json b/Regression/Checksum/benchmarks_json/laser_acceleration_rz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserAccelerationRZ.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_rz.json diff --git a/Regression/Checksum/benchmarks_json/LaserIonAcc2d.json b/Regression/Checksum/benchmarks_json/laser_ion_acc_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserIonAcc2d.json rename to Regression/Checksum/benchmarks_json/laser_ion_acc_2d.json diff --git a/Regression/Checksum/benchmarks_json/Python_LaserIonAcc2d.json b/Regression/Checksum/benchmarks_json/laser_ion_acc_2d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LaserIonAcc2d.json rename to Regression/Checksum/benchmarks_json/laser_ion_acc_2d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/RefinedInjection.json b/Regression/Checksum/benchmarks_json/refined_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/RefinedInjection.json rename to Regression/Checksum/benchmarks_json/refined_injection.json From 89b38548cf0f3585fa7dba51c7bf5e8403f93a02 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 15:29:50 -0700 Subject: [PATCH 089/167] Fix broken tests --- Examples/Tests/embedded_boundary_cube/analysis_fields.py | 6 +++--- .../magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Examples/Tests/embedded_boundary_cube/analysis_fields.py b/Examples/Tests/embedded_boundary_cube/analysis_fields.py index dc6af9d57d2..c0949abe9f5 100755 --- a/Examples/Tests/embedded_boundary_cube/analysis_fields.py +++ b/Examples/Tests/embedded_boundary_cube/analysis_fields.py @@ -23,6 +23,8 @@ # $$ k_y = \frac{n\pi}{L}$$ # $$ k_z = \frac{p\pi}{L}$$ +test_name = os.path.split(os.getcwd())[1] + hi = [0.8, 0.8, 0.8] lo = [-0.8, -0.8, -0.8] ncells = [48, 48, 48] @@ -44,7 +46,7 @@ # Parse test name and check whether this use the macroscopic solver # (i.e. solving the equation in a dielectric) -macroscopic = True if re.search( 'macroscopic', filename ) else False +macroscopic = True if re.search( 'macroscopic', test_name ) else False # Calculate frequency of the mode oscillation omega = np.sqrt( h_2 ) * c @@ -95,6 +97,4 @@ rel_err_z = np.sqrt( np.sum(np.square(Bz_sim - Bz_th)) / np.sum(np.square(Bz_th))) assert(rel_err_z < rel_tol_err) -test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d b/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d index 60617f7d392..73ff14dc8a4 100644 --- a/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d +++ b/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d @@ -48,4 +48,3 @@ diag1.diag_type = Full diag1.format = plotfile diag1.intervals = 1 diag1.fields_to_plot = Az Bx By Ex Ey jz phi rho -diag1.file_prefix = ./magnetostatic_eb_3d_mr_plt From c5b0e714c5d63f0b751b2fe32888e2d280019b16 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:47:45 +0000 Subject: [PATCH 090/167] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../laser_acceleration/analysis_openpmd_rz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py b/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py index 9f7d2879791..44cb1057406 100755 --- a/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py +++ b/Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 -import numpy as np import sys +import numpy as np import openpmd_api as io filename = sys.argv[1] From 7903470d72e12b0e1690cf174bfd4abf418f9d92 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 16:30:05 -0700 Subject: [PATCH 091/167] Fix codeQL warning, GitHub Action's YAML files --- .github/workflows/clang_sanitizers.yml | 16 ++++++++-------- .github/workflows/insitu.yml | 2 +- .github/workflows/ubuntu.yml | 12 ++++++------ .../analysis_proton_boron_fusion.py | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/clang_sanitizers.yml b/.github/workflows/clang_sanitizers.yml index 33c6646af73..75542b39dea 100644 --- a/.github/workflows/clang_sanitizers.yml +++ b/.github/workflows/clang_sanitizers.yml @@ -63,10 +63,10 @@ jobs: #MPI implementations often leak memory export "ASAN_OPTIONS=detect_leaks=0" - mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz - mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d - mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d - mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d + mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base + mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d + mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base + mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base build_thread_sanitizer: name: Clang thread sanitizer @@ -144,10 +144,10 @@ jobs: export OMP_NUM_THREADS=2 - mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base warpx.serialize_initial_conditions = 0 git clone https://github.com/ECP-WarpX/warpx-data ../warpx-data cd Examples/Tests/embedded_circle diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml index 42923d3df8e..1e2fc756394 100644 --- a/.github/workflows/insitu.yml +++ b/.github/workflows/insitu.yml @@ -54,7 +54,7 @@ jobs: cmake --build build -j 4 - name: Test run: | - cp Examples/Physics_applications/laser_acceleration/inputs_3d . + cp Examples/Physics_applications/laser_acceleration/inputs_3d_base . cp Examples/Physics_applications/laser_acceleration/3d_ascent_actions.yaml ascent_actions.yaml mpiexec -n 2 ./build/bin/warpx.3d \ inputs_3d \ diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 05e53883534..46b2b10bd42 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,8 +39,8 @@ jobs: -DWarpX_MPI=OFF \ -DWarpX_QED=OFF cmake --build build -j 4 - ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d - ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz + ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base + ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base ccache -s du -hs ~/.cache/ccache @@ -82,8 +82,8 @@ jobs: -DWarpX_QED_TOOLS=ON cmake --build build -j 4 - ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d - ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d + ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d + ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base ccache -s du -hs ~/.cache/ccache @@ -133,8 +133,8 @@ jobs: -DWarpX_QED_TABLE_GEN=ON cmake --build build -j 4 - ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d - ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz + ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base + ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base ccache -s du -hs ~/.cache/ccache diff --git a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py index ec2a7c04a96..8ae108a7a14 100755 --- a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py +++ b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py @@ -81,8 +81,9 @@ E_fusion_total = E_fusion + E_decay # Energy released during p + B -> 3*alpha ## Checks whether this is the 2D or the 3D test -warpx_used_inputs = open('./warpx_used_inputs', 'r').read() -is_2D = re.search('geometry.dims\s*=\s*2', warpx_used_inputs) +warpx_used_inputs = open('./warpx_used_inputs', 'r') +is_2D = re.search('geometry.dims\s*=\s*2', warpx_used_inputs.read()) +warpx_used_inputs.close() ## Some numerical parameters for this test size_x = 8 From ddacf8d01c0d0d4ce62980dfc337b2c9ede93151 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 16:39:48 -0700 Subject: [PATCH 092/167] Fix codeQL warning --- Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py index 8ae108a7a14..a7bb14641b3 100755 --- a/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py +++ b/Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py @@ -81,8 +81,8 @@ E_fusion_total = E_fusion + E_decay # Energy released during p + B -> 3*alpha ## Checks whether this is the 2D or the 3D test -warpx_used_inputs = open('./warpx_used_inputs', 'r') -is_2D = re.search('geometry.dims\s*=\s*2', warpx_used_inputs.read()) +with open('./warpx_used_inputs') as warpx_used_inputs: + is_2D = re.search('geometry.dims\s*=\s*2', warpx_used_inputs.read()) warpx_used_inputs.close() ## Some numerical parameters for this test From 1534e1f2d8861176bc5dc0f187be005ad2e18cbb Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 17:01:42 -0700 Subject: [PATCH 093/167] Add more tests --- Examples/Physics_applications/CMakeLists.txt | 1 + .../plasma_acceleration/CMakeLists.txt | 62 +++++++++++++++++++ .../{inputs_2d => inputs_2d_base} | 7 ++- .../inputs_2d_test_plasma_acceleration_2d_mr | 2 + ...sma_acceleration_2d_mr_momentum_conserving | 5 ++ ...ts_2d_test_plasma_acceleration_boosted_2d} | 4 +- .../{inputs_3d_boost => inputs_3d_base} | 2 +- ...uts_3d_test_plasma_acceleration_boosted_3d | 5 ++ ...test_plasma_acceleration_boosted_3d_hybrid | 7 +++ ...MR.json => plasma_acceleration_2d_mr.json} | 0 ...celeration_2d_mr_momentum_conserving.json} | 0 ...on => plasma_acceleration_boosted_2d.json} | 0 ...on => plasma_acceleration_boosted_3d.json} | 0 ...lasma_acceleration_boosted_3d_hybrid.json} | 0 14 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 Examples/Physics_applications/plasma_acceleration/CMakeLists.txt rename Examples/Physics_applications/plasma_acceleration/{inputs_2d => inputs_2d_base} (96%) create mode 100644 Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr create mode 100644 Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving rename Examples/Physics_applications/plasma_acceleration/{inputs_2d_boost => inputs_2d_test_plasma_acceleration_boosted_2d} (98%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_boost => inputs_3d_base} (99%) create mode 100644 Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d create mode 100644 Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid rename Regression/Checksum/benchmarks_json/{PlasmaAccelerationMR.json => plasma_acceleration_2d_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{momentum-conserving-gather.json => plasma_acceleration_2d_mr_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{PlasmaAccelerationBoost2d.json => plasma_acceleration_boosted_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{PlasmaAccelerationBoost3d.json => plasma_acceleration_boosted_3d.json} (100%) rename Regression/Checksum/benchmarks_json/{PlasmaAccelerationBoost3d_hybrid.json => plasma_acceleration_boosted_3d_hybrid.json} (100%) diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index 068082f7c40..08fd90ed684 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -4,3 +4,4 @@ add_subdirectory(capacitive_discharge) add_subdirectory(laser_acceleration) add_subdirectory(laser_ion) +add_subdirectory(plasma_acceleration) diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt new file mode 100644 index 00000000000..d380fab9f18 --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -0,0 +1,62 @@ +# Add tests (alphabetical order) ############################################## +# + +# plasma_acceleration_2d_mr ################################################### +# +add_warpx_test( + plasma_acceleration_2d_mr # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000400 # output +) + +# plasma_acceleration_2d_mr_momentum_conserving ############################### +# +add_warpx_test( + plasma_acceleration_2d_mr_momentum_conserving # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000400 # output +) + +# plasma_acceleration_boosted_2d ############################################## +# +add_warpx_test( + plasma_acceleration_boosted_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000020 # output +) + +# plasma_acceleration_boosted_3d ############################################## +# +add_warpx_test( + plasma_acceleration_boosted_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000005 # output +) + +# plasma_acceleration_boosted_3d_hybrid ####################################### +# +add_warpx_test( + plasma_acceleration_boosted_3d_hybrid # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000025 # output +) diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d b/Examples/Physics_applications/plasma_acceleration/inputs_2d_base similarity index 96% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d rename to Examples/Physics_applications/plasma_acceleration/inputs_2d_base index 7e11ae7b3de..769e1ebce37 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_2d +++ b/Examples/Physics_applications/plasma_acceleration/inputs_2d_base @@ -1,11 +1,12 @@ ################################# ####### GENERAL PARAMETERS ###### ################################# -stop_time = 3.7e-12 -amr.n_cell = 64 128 +#stop_time = 3.7e-12 +max_step = 400 +amr.n_cell = 32 512 #64 128 amr.max_grid_size = 128 amr.blocking_factor = 32 -amr.max_level = 0 +amr.max_level = 1 geometry.dims = 2 geometry.prob_lo = -125.e-6 -149.e-6 geometry.prob_hi = 125.e-6 1.e-6 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr new file mode 100644 index 00000000000..a9e0a64cbc5 --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_2d_base diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving new file mode 100644 index 00000000000..8ce4ee3d1d0 --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_2d_base + +# test input parameters +algo.field_gathering = momentum-conserving diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_boost b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d similarity index 98% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d_boost rename to Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d index 76dcd3ee286..5d65649353c 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_2d_boost +++ b/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d @@ -1,8 +1,8 @@ ################################# ####### GENERAL PARAMETERS ###### ################################# -max_step = 2500 -amr.n_cell = 64 640 +max_step = 20 #2500 +amr.n_cell = 64 256 #64 640 amr.max_grid_size = 128 amr.blocking_factor = 32 amr.max_level = 0 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_boost b/Examples/Physics_applications/plasma_acceleration/inputs_3d_base similarity index 99% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_boost rename to Examples/Physics_applications/plasma_acceleration/inputs_3d_base index 2264872ec43..66debc4f99f 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_3d_boost +++ b/Examples/Physics_applications/plasma_acceleration/inputs_3d_base @@ -2,7 +2,7 @@ ####### GENERAL PARAMETERS ###### ################################# stop_time = 3.93151387287e-11 -amr.n_cell = 32 32 256 +amr.n_cell = 64 64 128 #32 32 256 amr.max_grid_size = 64 amr.blocking_factor = 32 amr.max_level = 0 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d new file mode 100644 index 00000000000..a01e344723e --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +max_step = 5 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid new file mode 100644 index 00000000000..d29c1775c59 --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid @@ -0,0 +1,7 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +max_step = 25 +warpx.do_current_centering = 0 +warpx.grid_type = hybrid diff --git a/Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PlasmaAccelerationMR.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr.json diff --git a/Regression/Checksum/benchmarks_json/momentum-conserving-gather.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/momentum-conserving-gather.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost2d.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost2d.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_2d.json diff --git a/Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost3d.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost3d.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d.json diff --git a/Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost3d_hybrid.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PlasmaAccelerationBoost3d_hybrid.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d_hybrid.json From 35d9b1f28899b6265ee08622b2520b303e5e3def Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 17:31:41 -0700 Subject: [PATCH 094/167] Fix GitHub Action's YAML files --- .github/workflows/insitu.yml | 2 +- .github/workflows/scripts/checkQEDTableGenerator.sh | 4 ++-- .github/workflows/windows.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml index 1e2fc756394..fd53d77da4a 100644 --- a/.github/workflows/insitu.yml +++ b/.github/workflows/insitu.yml @@ -57,7 +57,7 @@ jobs: cp Examples/Physics_applications/laser_acceleration/inputs_3d_base . cp Examples/Physics_applications/laser_acceleration/3d_ascent_actions.yaml ascent_actions.yaml mpiexec -n 2 ./build/bin/warpx.3d \ - inputs_3d \ + inputs_3d_base \ max_step = 40 \ diag1.intervals = 30:40:10 \ diag1.format = ascent diff --git a/.github/workflows/scripts/checkQEDTableGenerator.sh b/.github/workflows/scripts/checkQEDTableGenerator.sh index e14a7a2d6f2..c5573915891 100755 --- a/.github/workflows/scripts/checkQEDTableGenerator.sh +++ b/.github/workflows/scripts/checkQEDTableGenerator.sh @@ -29,7 +29,7 @@ export OMP_NUM_THREADS=2 # Generate QED lookup tables using WarpX # ./build/bin/warpx.2d \ - ./Examples/Tests/qed/quantum_synchrotron/inputs_2d \ + ./Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d \ qed_bw.lookup_table_mode = "generate" \ qed_bw.tab_dndt_chi_min = 0.01 \ qed_bw.tab_dndt_chi_max = 100.0 \ @@ -70,7 +70,7 @@ diff qs_table_dndt qs_table_tool_dndt # Run a WarpX simulation using the lookup tables generated by the external tool # ./build/bin/warpx.2d \ - ./Examples/Tests/qed/quantum_synchrotron/inputs_2d \ + ./Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d \ qed_bw.lookup_table_mode = "load" \ qed_bw.load_table_from = "bw_table_tool" \ qed_qs.lookup_table_mode = "load" \ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3c0faaf3636..edd7f251682 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -54,7 +54,7 @@ jobs: run: | $env:PATH += ';C:/Program Files (x86)/WarpX/bin/' - python3 Examples\Tests\gaussian_beam\PICMI_inputs_gaussian_beam.py + python3 Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py # JSON writes are currently very slow (50min) with MSVC # --diagformat=openpmd @@ -118,5 +118,5 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64 set "PATH=C:/Program Files (x86)/WarpX/bin/;%PATH%" - python3 Examples\Tests\gaussian_beam\PICMI_inputs_gaussian_beam.py --diagformat=openpmd + python3 Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py --diagformat=openpmd if errorlevel 1 exit 1 From 5d2f6c4ed6565270cfeb728c2e5ad3353250f57b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 19 Aug 2024 17:49:10 -0700 Subject: [PATCH 095/167] Add more tests --- .../plasma_acceleration/CMakeLists.txt | 36 +++++++++++++++++++ ...s_1d_test_plasma_acceleration_1d_picmi.py} | 4 +-- ...d_test_plasma_acceleration_3d_mr_picmi.py} | 4 +-- ...s_3d_test_plasma_acceleration_3d_picmi.py} | 4 +-- ...json => plasma_acceleration_1d_picmi.json} | 0 ...n => plasma_acceleration_3d_mr_picmi.json} | 0 ...json => plasma_acceleration_3d_picmi.json} | 0 7 files changed, 39 insertions(+), 9 deletions(-) rename Examples/Physics_applications/plasma_acceleration/{PICMI_inputs_plasma_acceleration_1d.py => inputs_1d_test_plasma_acceleration_1d_picmi.py} (94%) rename Examples/Physics_applications/plasma_acceleration/{PICMI_inputs_plasma_acceleration_mr.py => inputs_3d_test_plasma_acceleration_3d_mr_picmi.py} (95%) rename Examples/Physics_applications/plasma_acceleration/{PICMI_inputs_plasma_acceleration.py => inputs_3d_test_plasma_acceleration_3d_picmi.py} (94%) rename Regression/Checksum/benchmarks_json/{Python_PlasmaAcceleration1d.json => plasma_acceleration_1d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_PlasmaAccelerationMR.json => plasma_acceleration_3d_mr_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_PlasmaAcceleration.json => plasma_acceleration_3d_picmi.json} (100%) diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index d380fab9f18..ae15add9828 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -1,6 +1,18 @@ # Add tests (alphabetical order) ############################################## # +# plasma_acceleration_1d_picmi ################################################ +# +add_warpx_test( + plasma_acceleration_1d_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1001000 # output +) + # plasma_acceleration_2d_mr ################################################### # add_warpx_test( @@ -60,3 +72,27 @@ add_warpx_test( Examples/analysis_default_regression.py # analysis diags/diag1000025 # output ) + +# plasma_acceleration_3d_picmi ################################################ +# +add_warpx_test( + plasma_acceleration_3d_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# plasma_acceleration_3d_mr_picmi ############################################# +# +add_warpx_test( + plasma_acceleration_3d_mr_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000002 # output +) diff --git a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_1d.py b/Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py similarity index 94% rename from Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_1d.py rename to Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py index 27f7236204e..7ad3851eb62 100755 --- a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_1d.py +++ b/Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py @@ -54,9 +54,7 @@ field_diag = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = max_steps, - data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell'], - write_dir = '.', - warpx_file_prefix = 'Python_PlasmaAcceleration1d_plt') + data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell']) part_diag = picmi.ParticleDiagnostic(name = 'diag1', period = max_steps, diff --git a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_mr.py b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py similarity index 95% rename from Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_mr.py rename to Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py index 52a9729a1fb..45c7f64df73 100755 --- a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration_mr.py +++ b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py @@ -65,9 +65,7 @@ field_diag = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = 2, - data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell'], - write_dir = '.', - warpx_file_prefix = 'Python_PlasmaAccelerationMR_plt') + data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell']) part_diag = picmi.ParticleDiagnostic(name = 'diag1', period = 2, diff --git a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration.py b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py similarity index 94% rename from Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration.py rename to Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py index 296aea48b35..b3f4fd7c7ac 100755 --- a/Examples/Physics_applications/plasma_acceleration/PICMI_inputs_plasma_acceleration.py +++ b/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py @@ -60,9 +60,7 @@ field_diag = picmi.FieldDiagnostic(name = 'diag1', grid = grid, period = max_steps, - data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell'], - write_dir = '.', - warpx_file_prefix = 'Python_PlasmaAcceleration_plt') + data_list = ['Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz', 'part_per_cell']) part_diag = picmi.ParticleDiagnostic(name = 'diag1', period = max_steps, diff --git a/Regression/Checksum/benchmarks_json/Python_PlasmaAcceleration1d.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_1d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_PlasmaAcceleration1d.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_1d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_PlasmaAccelerationMR.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_3d_mr_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_PlasmaAccelerationMR.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_3d_mr_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_PlasmaAcceleration.json b/Regression/Checksum/benchmarks_json/plasma_acceleration_3d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_PlasmaAcceleration.json rename to Regression/Checksum/benchmarks_json/plasma_acceleration_3d_picmi.json From e63b2afb9ce92fef17b87c2e1ef6881234fdebdc Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 08:54:20 -0700 Subject: [PATCH 096/167] Fix unbound variable in Azure pipelines --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 35fef4e92c1..852f4afd5c7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -18,7 +18,6 @@ jobs: FFTW_HOME: '/usr' LAPACKPP_HOME: '/usr/local' #OMP_NUM_THREADS: 1 - AMReX_CMAKE_FLAGS: '-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON' WARPX_CI_CCACHE: 'TRUE' #WARPX_CI_NUM_MAKE_JOBS: 2 #WARPX_CI_OPENPMD: 'TRUE' @@ -150,6 +149,7 @@ jobs: set -eu -o pipefail df -h # configure + export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} # build cmake --build build -j 2 From 0688042ebb10bf9b4ad87b2ab5bb1852750875a2 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 10:11:11 -0700 Subject: [PATCH 097/167] Fix GitHub Action's YAML files --- .github/workflows/clang_sanitizers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang_sanitizers.yml b/.github/workflows/clang_sanitizers.yml index 75542b39dea..a20c344a6c9 100644 --- a/.github/workflows/clang_sanitizers.yml +++ b/.github/workflows/clang_sanitizers.yml @@ -154,7 +154,7 @@ jobs: ulimit -c unlimited - mpirun -n 2 ../../../build_EB/bin/warpx.2d inputs_2d warpx.serialize_initial_conditions = 0 + mpirun -n 2 ../../../build_EB/bin/warpx.2d inputs_2d_test_embedded_circle warpx.serialize_initial_conditions = 0 save_pr_number: if: github.event_name == 'pull_request' From 2cfe3c2d6884ecb43a9ec9de9e7975a05524427f Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 10:30:14 -0700 Subject: [PATCH 098/167] Add more tests --- Examples/Physics_applications/CMakeLists.txt | 1 + .../laser_acceleration/CMakeLists.txt | 36 +++++++++++ ...2d_test_laser_acceleration_2d_mr_picmi.py} | 8 +-- ...ts_3d_test_laser_acceleration_3d_picmi.py} | 8 +-- ...ts_rz_test_laser_acceleration_rz_picmi.py} | 8 +-- .../plasma_mirror/CMakeLists.txt | 14 ++++ ...inputs_2d => inputs_2d_test_plasma_mirror} | 4 +- Examples/Tests/CMakeLists.txt | 1 + .../electrostatic_sphere_eb/CMakeLists.txt | 14 ++++ ...s_3d_test_electrostatic_sphere_eb_picmi.py | 4 -- Examples/Tests/gaussian_beam/CMakeLists.txt | 12 ++++ ... => inputs_3d_test_focusing_gaussian_beam} | 0 Examples/Tests/reduced_diags/CMakeLists.txt | 64 +++++++++++++++++++ ...lysis_reduced_diags_load_balance_costs.py} | 2 +- ...inputs_loadbalancecosts => inputs_3d_base} | 0 .../{inputs => inputs_3d_test_reduced_diags} | 0 ...reduced_diags_load_balance_costs_heuristic | 5 ++ ...st_reduced_diags_load_balance_costs_timers | 5 ++ ..._diags_load_balance_costs_timers_picmi.py} | 7 +- ...uced_diags_load_balance_costs_timers_psatd | 5 ++ ...son => electrostatic_sphere_eb_picmi.json} | 0 ...on => laser_acceleration_2d_mr_picmi.json} | 0 ....json => laser_acceleration_3d_picmi.json} | 0 ....json => laser_acceleration_rz_picmi.json} | 0 .../{PlasmaMirror.json => plasma_mirror.json} | 0 ...d_diags_load_balance_costs_heuristic.json} | 0 ...uced_diags_load_balance_costs_timers.json} | 0 ...iags_load_balance_costs_timers_psatd.json} | 0 28 files changed, 168 insertions(+), 30 deletions(-) rename Examples/Physics_applications/laser_acceleration/{PICMI_inputs_2d.py => inputs_2d_test_laser_acceleration_2d_mr_picmi.py} (94%) rename Examples/Physics_applications/laser_acceleration/{PICMI_inputs_3d.py => inputs_3d_test_laser_acceleration_3d_picmi.py} (95%) rename Examples/Physics_applications/laser_acceleration/{PICMI_inputs_rz.py => inputs_rz_test_laser_acceleration_rz_picmi.py} (94%) create mode 100644 Examples/Physics_applications/plasma_mirror/CMakeLists.txt rename Examples/Physics_applications/plasma_mirror/{inputs_2d => inputs_2d_test_plasma_mirror} (98%) rename Examples/Tests/gaussian_beam/{inputs_focusing_beam => inputs_3d_test_focusing_gaussian_beam} (100%) create mode 100644 Examples/Tests/reduced_diags/CMakeLists.txt rename Examples/Tests/reduced_diags/{analysis_reduced_diags_loadbalancecosts.py => analysis_reduced_diags_load_balance_costs.py} (98%) rename Examples/Tests/reduced_diags/{inputs_loadbalancecosts => inputs_3d_base} (100%) rename Examples/Tests/reduced_diags/{inputs => inputs_3d_test_reduced_diags} (100%) create mode 100644 Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic create mode 100644 Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers rename Examples/Tests/reduced_diags/{PICMI_inputs_loadbalancecosts.py => inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py} (91%) create mode 100644 Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd rename Regression/Checksum/benchmarks_json/{Python_ElectrostaticSphereEB.json => electrostatic_sphere_eb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LaserAccelerationMR.json => laser_acceleration_2d_mr_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LaserAcceleration.json => laser_acceleration_3d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_LaserAccelerationRZ.json => laser_acceleration_rz_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{PlasmaMirror.json => plasma_mirror.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_loadbalancecosts_heuristic.json => reduced_diags_load_balance_costs_heuristic.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_loadbalancecosts_timers.json => reduced_diags_load_balance_costs_timers.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_loadbalancecosts_timers_psatd.json => reduced_diags_load_balance_costs_timers_psatd.json} (100%) diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index 08fd90ed684..e33939d653a 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -5,3 +5,4 @@ add_subdirectory(capacitive_discharge) add_subdirectory(laser_acceleration) add_subdirectory(laser_ion) add_subdirectory(plasma_acceleration) +add_subdirectory(plasma_mirror) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 4533c82cd31..0e551603438 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -73,6 +73,18 @@ add_warpx_test( diags/diag1000200 # output ) +# laser_acceleration_2d_mr_picmi ############################################## +# +add_warpx_test( + laser_acceleration_2d_mr_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000200 # output +) + # laser_acceleration_3d ####################################################### # add_warpx_test( @@ -85,6 +97,18 @@ add_warpx_test( diags/diag1/ # output ) +# laser_acceleration_3d_picmi ################################################# +# +add_warpx_test( + laser_acceleration_3d_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000100 # output +) + # laser_acceleration_3d_single_precision_comms ################################ # add_warpx_test( @@ -121,6 +145,18 @@ add_warpx_test( diags/diag1/ # output ) +# laser_acceleration_rz_picmi ################################################# +# +add_warpx_test( + laser_acceleration_rz_picmi # name + RZ # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + # refined_injection ########################################################### # add_warpx_test( diff --git a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_2d.py b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py similarity index 94% rename from Examples/Physics_applications/laser_acceleration/PICMI_inputs_2d.py rename to Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py index b50e16bfc0a..d139678acd1 100755 --- a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_2d.py +++ b/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py @@ -114,16 +114,12 @@ diag_field_list = ['B', 'E', 'J', 'rho'] particle_diag = picmi.ParticleDiagnostic( name = 'diag1', - period = 200, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAccelerationMR_plt') + period = 200) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 200, - data_list = diag_field_list, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAccelerationMR_plt') + data_list = diag_field_list) # Set up simulation sim = picmi.Simulation( diff --git a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py similarity index 95% rename from Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py rename to Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py index 13bf492e203..3ab29357561 100755 --- a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py +++ b/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py @@ -114,16 +114,12 @@ diag_field_list = ['B', 'E', 'J', 'rho'] particle_diag = picmi.ParticleDiagnostic( name = 'diag1', - period = 100, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAcceleration_plt') + period = 100) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 100, - data_list = diag_field_list, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAcceleration_plt') + data_list = diag_field_list) # Set up simulation sim = picmi.Simulation( diff --git a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_rz.py b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py similarity index 94% rename from Examples/Physics_applications/laser_acceleration/PICMI_inputs_rz.py rename to Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py index 7f09db8d6b3..743e91b5b4d 100755 --- a/Examples/Physics_applications/laser_acceleration/PICMI_inputs_rz.py +++ b/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py @@ -113,17 +113,13 @@ grid = grid, period = 10, data_list = diag_field_list, - warpx_dump_rz_modes = 1, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAccelerationRZ_plt') + warpx_dump_rz_modes = 1) diag_particle_list = ['weighting', 'momentum'] particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 10, species = [electrons, beam], - data_list = diag_particle_list, - write_dir = '.', - warpx_file_prefix = 'Python_LaserAccelerationRZ_plt') + data_list = diag_particle_list) # Set up simulation sim = picmi.Simulation( diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt new file mode 100644 index 00000000000..678abd0c726 --- /dev/null +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# plasma_mirror ############################################################### +# +add_warpx_test( + plasma_mirror # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000020 # output +) diff --git a/Examples/Physics_applications/plasma_mirror/inputs_2d b/Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror similarity index 98% rename from Examples/Physics_applications/plasma_mirror/inputs_2d rename to Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror index 714af80affe..c2c67fe928c 100644 --- a/Examples/Physics_applications/plasma_mirror/inputs_2d +++ b/Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror @@ -1,8 +1,8 @@ ################################# ####### GENERAL PARAMETERS ###### ################################# -max_step = 1000 -amr.n_cell = 1024 512 +max_step = 20 #1000 +amr.n_cell = 256 128 #1024 512 amr.max_grid_size = 128 amr.blocking_factor = 32 amr.max_level = 0 diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index c4c65a73e10..48f9607feed 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -55,6 +55,7 @@ add_subdirectory(point_of_contact_eb) add_subdirectory(python_wrappers) add_subdirectory(qed) add_subdirectory(radiation_reaction) +add_subdirectory(reduced_diags) add_subdirectory(relativistic_space_charge_initialization) add_subdirectory(repelling_particles) add_subdirectory(resampling) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 80bafed2a2c..570058de015 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -29,6 +29,20 @@ if(WarpX_EB) ) endif() +# electrostatic_sphere_eb_picmi ############################################### +# +if(WarpX_EB) + add_warpx_test( + electrostatic_sphere_eb_picmi # name + 3 # dims + 2 # nprocs + ON # eb + Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py # inputs + Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis + diags/diag1000002 # output + ) +endif() + # electrostatic_sphere_eb_rz ################################################## # if(WarpX_EB) diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py index 55fbc87bd9e..922eda44c6b 100755 --- a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py +++ b/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py @@ -73,16 +73,12 @@ particle_diag = picmi.ParticleDiagnostic( name = 'diag1', period = 1, - write_dir = '.', - warpx_file_prefix = 'Python_ElectrostaticSphereEB_plt' ) field_diag = picmi.FieldDiagnostic( name = 'diag1', grid = grid, period = 1, data_list = ['Ex', 'Ey', 'Ez', 'phi', 'rho'], - write_dir = '.', - warpx_file_prefix = 'Python_ElectrostaticSphereEB_plt' ) reduced_diag = picmi.ReducedDiagnostic( diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index e2f4ab6e703..43ad9539991 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -1,6 +1,18 @@ # Add tests (alphabetical order) ############################################## # +# focusing_gaussian_beam ###################################################### +# +add_warpx_test( + focusing_gaussian_beam # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam # inputs + Examples/Tests/gaussian_beam/analysis_focusing_beam.py # analysis + diags/diag1000000 # output +) + # gaussian_beam_picmi ######################################################### # add_warpx_test( diff --git a/Examples/Tests/gaussian_beam/inputs_focusing_beam b/Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam similarity index 100% rename from Examples/Tests/gaussian_beam/inputs_focusing_beam rename to Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt new file mode 100644 index 00000000000..e5439d8f2f8 --- /dev/null +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -0,0 +1,64 @@ +# Add tests (alphabetical order) ############################################## +# + +# reduced_diags ############################################################### +# +add_warpx_test( + reduced_diags # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags # inputs + Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis + diags/diag1000200 # output +) + +# reduced_diags_load_balance_costs_heuristic ################################## +# +add_warpx_test( + reduced_diags_load_balance_costs_heuristic # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic # inputs + Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output +) + +# reduced_diags_load_balance_costs_timers ##################################### +# +add_warpx_test( + reduced_diags_load_balance_costs_timers # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers # inputs + Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output +) + +# reduced_diags_load_balance_costs_timers_picmi ############################### +# +add_warpx_test( + reduced_diags_load_balance_costs_timers_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py # inputs + Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output +) + +# reduced_diags_load_balance_costs_timers_psatd ############################### +# +if(WarpX_FFT) + add_warpx_test( + reduced_diags_load_balance_costs_timers_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd # inputs + Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output + ) +endif() diff --git a/Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py b/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py similarity index 98% rename from Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py rename to Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py index a706aace1f6..49531b887be 100755 --- a/Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py +++ b/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py @@ -71,5 +71,5 @@ def get_efficiency(i): # than non-load balanced case assert(efficiency_before < efficiency_after) -test_name = 'reduced_diags_loadbalancecosts_timers' +test_name = 'reduced_diags_load_balance_costs_timers' checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/Tests/reduced_diags/inputs_loadbalancecosts b/Examples/Tests/reduced_diags/inputs_3d_base similarity index 100% rename from Examples/Tests/reduced_diags/inputs_loadbalancecosts rename to Examples/Tests/reduced_diags/inputs_3d_base diff --git a/Examples/Tests/reduced_diags/inputs b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags similarity index 100% rename from Examples/Tests/reduced_diags/inputs rename to Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic new file mode 100644 index 00000000000..f9126eca62c --- /dev/null +++ b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.load_balance_costs_update = Heuristic diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers new file mode 100644 index 00000000000..0a4cbef3f76 --- /dev/null +++ b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.load_balance_costs_update = Timers diff --git a/Examples/Tests/reduced_diags/PICMI_inputs_loadbalancecosts.py b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py similarity index 91% rename from Examples/Tests/reduced_diags/PICMI_inputs_loadbalancecosts.py rename to Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py index 0583a6fe1d0..2aef7ba358d 100644 --- a/Examples/Tests/reduced_diags/PICMI_inputs_loadbalancecosts.py +++ b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py @@ -83,16 +83,12 @@ period=3, species=[electrons], data_list = ['ux', 'uy', 'uz', 'x', 'y', 'z', 'weighting'], - write_dir='.', - warpx_file_prefix='Python_reduced_diags_loadbalancecosts_timers_plt' ) field_diag = picmi.FieldDiagnostic( name='diag1', grid=grid, period=3, data_list = ['Bx', 'By', 'Bz', 'Ex', 'Ey', 'Ez', 'Jx', 'Jy', 'Jz'], - write_dir='.', - warpx_file_prefix='Python_reduced_diags_loadbalancecosts_timers_plt' ) # Set up simulation @@ -103,7 +99,8 @@ particle_shape=1, warpx_current_deposition_algo='esirkepov', warpx_field_gathering_algo='energy-conserving', - warpx_load_balance_intervals=2 + warpx_load_balance_intervals=2, + warpx_load_balance_costs_update='timers' ) # Add species diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd new file mode 100644 index 00000000000..0a4cbef3f76 --- /dev/null +++ b/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +algo.load_balance_costs_update = Timers diff --git a/Regression/Checksum/benchmarks_json/Python_ElectrostaticSphereEB.json b/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ElectrostaticSphereEB.json rename to Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json b/Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LaserAccelerationMR.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAcceleration.json b/Regression/Checksum/benchmarks_json/laser_acceleration_3d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LaserAcceleration.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_3d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_LaserAccelerationRZ.json b/Regression/Checksum/benchmarks_json/laser_acceleration_rz_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_LaserAccelerationRZ.json rename to Regression/Checksum/benchmarks_json/laser_acceleration_rz_picmi.json diff --git a/Regression/Checksum/benchmarks_json/PlasmaMirror.json b/Regression/Checksum/benchmarks_json/plasma_mirror.json similarity index 100% rename from Regression/Checksum/benchmarks_json/PlasmaMirror.json rename to Regression/Checksum/benchmarks_json/plasma_mirror.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_heuristic.json b/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_heuristic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_heuristic.json rename to Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_heuristic.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_timers.json b/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_timers.json rename to Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_timers_psatd.json b/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_loadbalancecosts_timers_psatd.json rename to Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers_psatd.json From 0469a21dd7f74e77b51a2562c76f52827866a934 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 11:51:31 -0700 Subject: [PATCH 099/167] Fix GitHub Action's YAML files --- .github/workflows/intel.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 8a7867fcbc8..53244aafd5c 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -132,7 +132,7 @@ jobs: source /opt/intel/oneapi/setvars.sh set -e export OMP_NUM_THREADS=2 - Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py + Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py build_dpcc: name: oneAPI DPC++ SP diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index dfd32f459f0..6c80bdfebab 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -84,7 +84,7 @@ jobs: source py-venv/bin/activate export OMP_NUM_THREADS=1 - mpirun -n 2 Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py + mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py save_pr_number: if: github.event_name == 'pull_request' diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 46b2b10bd42..fc28eaf5949 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -222,7 +222,7 @@ jobs: - name: run pywarpx run: | export OMP_NUM_THREADS=1 - mpirun -n 2 Examples/Physics_applications/laser_acceleration/PICMI_inputs_3d.py + mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py save_pr_number: if: github.event_name == 'pull_request' From 36021dbc2266c2bc8a1270e156897866ce902c38 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 11:55:02 -0700 Subject: [PATCH 100/167] Remove unused checksum file --- .../benchmarks_json/LaserIonAcc3d.json | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 Regression/Checksum/benchmarks_json/LaserIonAcc3d.json diff --git a/Regression/Checksum/benchmarks_json/LaserIonAcc3d.json b/Regression/Checksum/benchmarks_json/LaserIonAcc3d.json deleted file mode 100644 index de5472105d9..00000000000 --- a/Regression/Checksum/benchmarks_json/LaserIonAcc3d.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "electrons": { - "particle_momentum_x": 1.6966182372218133e-16, - "particle_momentum_y": 2.6850066145197374e-17, - "particle_momentum_z": 2.0052710316284176e-16, - "particle_position_x": 0.3393352015355679, - "particle_position_y": 1.1078675395554147, - "particle_position_z": 0.3419438867441836, - "particle_weight": 26433181926540.81 - }, - "hydrogen": { - "particle_momentum_x": 1.7161831722699107e-16, - "particle_momentum_y": 4.9196233343263506e-17, - "particle_momentum_z": 2.1370961936359413e-16, - "particle_position_x": 0.3375134789944616, - "particle_position_y": 1.1080021730384098, - "particle_position_z": 0.33939049172256086, - "particle_weight": 26441597005520.95 - }, - "lev=0": { - "Bx": 41555976.87146437, - "By": 175750876.1712573, - "Bz": 35156983.723599546, - "Ex": 3.872657491899755e+17, - "Ey": 3.3815796095277564e+16, - "Ez": 3.937276394651024e+17, - "jx": 3.5072653955241413e+21, - "jy": 4.011484251839508e+20, - "jz": 3.787151010057889e+21, - "rho": 7429502184315.598 - } -} \ No newline at end of file From ca90c32e8987fee1cc3e58e661cc058e842b0809 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 13:19:47 -0700 Subject: [PATCH 101/167] Add more tests --- Examples/Tests/gaussian_beam/CMakeLists.txt | 2 +- ...mi.py => inputs_3d_test_gaussian_beam_picmi.py} | 0 .../benchmarks_json/id_cpu_read_picmi.json | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) rename Examples/Tests/gaussian_beam/{inputs_2d_test_gaussian_beam_picmi.py => inputs_3d_test_gaussian_beam_picmi.py} (100%) create mode 100644 Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 43ad9539991..62e724be736 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -20,7 +20,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py # inputs + Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py b/Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py similarity index 100% rename from Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py rename to Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py diff --git a/Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json b/Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json new file mode 100644 index 00000000000..a59b780ba38 --- /dev/null +++ b/Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json @@ -0,0 +1,14 @@ +{ + "lev=0": { + "phi": 0.001516261625969309 + }, + "electrons": { + "particle_momentum_x": 7.751654441658017e-26, + "particle_momentum_y": 6.938526597814195e-26, + "particle_momentum_z": 6.572520038890184e-26, + "particle_newPid": 500.0, + "particle_position_x": 1.4999588764815643, + "particle_position_y": 1.4999551809411737, + "particle_weight": 200.0 + } +} From 4186d30af346d601eb6e0ec61a3bf4c65149dde6 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 15:06:48 -0700 Subject: [PATCH 102/167] Add Python tests with custom command-line arguments --- Examples/CMakeLists.txt | 8 +++++ .../capacitive_discharge/CMakeLists.txt | 30 +++++++++++++++++++ ...I_inputs_1d.py => inputs_1d_base_picmi.py} | 12 -------- Examples/Tests/CMakeLists.txt | 1 + .../Tests/ohm_solver_em_modes/CMakeLists.txt | 30 +++++++++++++++++++ .../README.rst | 0 .../analysis.py | 0 .../analysis_rz.py | 0 ...s_1d_test_ohm_solver_em_modes_1d_picmi.py} | 4 --- ...s_rz_test_ohm_solver_em_modes_rz_picmi.py} | 2 -- ...Python_dsmc_1d.json => dsmc_1d_picmi.json} | 0 ...json => ohm_solver_em_modes_1d_picmi.json} | 0 ...json => ohm_solver_em_modes_rz_picmi.json} | 0 13 files changed, 69 insertions(+), 18 deletions(-) rename Examples/Physics_applications/capacitive_discharge/{PICMI_inputs_1d.py => inputs_1d_base_picmi.py} (97%) create mode 100644 Examples/Tests/ohm_solver_em_modes/CMakeLists.txt rename Examples/Tests/{ohm_solver_EM_modes => ohm_solver_em_modes}/README.rst (100%) rename Examples/Tests/{ohm_solver_EM_modes => ohm_solver_em_modes}/analysis.py (100%) rename Examples/Tests/{ohm_solver_EM_modes => ohm_solver_em_modes}/analysis_rz.py (100%) rename Examples/Tests/{ohm_solver_EM_modes/PICMI_inputs.py => ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py} (98%) rename Examples/Tests/{ohm_solver_EM_modes/PICMI_inputs_rz.py => ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py} (98%) rename Regression/Checksum/benchmarks_json/{Python_dsmc_1d.json => dsmc_1d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ohms_law_solver_EM_modes_1d.json => ohm_solver_em_modes_1d_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ohms_law_solver_EM_modes_rz.json => ohm_solver_em_modes_rz_picmi.json} (100%) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index ce77a492554..9d19c868640 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -25,6 +25,7 @@ function(add_warpx_test inputs analysis output + # ${ARGV7} optional command line arguments for Python tests ) # cannot run MPI tests w/o MPI build if(NOT WarpX_MPI) @@ -92,12 +93,17 @@ function(add_warpx_test # test run if(python) + set(command_line_args "") + if(${ARGC} GREATER 7) + set(command_line_args ${ARGV7}) + endif() add_test( NAME ${name}.run COMMAND ${THIS_MPI_TEST_EXE} ${THIS_Python_EXE} ${WarpX_SOURCE_DIR}/${inputs} + ${command_line_args} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) # FIXME Use helper function to handle Windows exceptions @@ -139,6 +145,8 @@ function(add_warpx_test ) # test analysis depends on test run set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") + # FIXME Use helper function to handle Windows exceptions + set(PYTHONPATH "${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") # add paths for custom Python modules set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index d6deedb6890..b878b3ff33a 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -1,6 +1,22 @@ # Add tests (alphabetical order) ############################################## # +# FIXME +# background_mcc_1d_picmi ##################################################### +# +#add_warpx_test( +# background_mcc_1d_picmi # name +# 1 # dims +# 2 # nprocs +# OFF # eb +# Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py # inputs +# Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis +# diags/diag1000050 # output +# "--test --pythonsolver" # optional command-line arguments +#) + +# background_mcc ############################################################## +# add_warpx_test( background_mcc # name 2 # dims @@ -35,3 +51,17 @@ add_warpx_test( Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output ) + +# FIXME +# dsmc_1d_picmi ############################################################### +# +#add_warpx_test( +# dsmc_1d_picmi # name +# 1 # dims +# 2 # nprocs +# OFF # eb +# Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py # inputs +# Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis +# diags/diag1000050 # output +# "--test --dsmc" # optional command-line arguments +#) diff --git a/Examples/Physics_applications/capacitive_discharge/PICMI_inputs_1d.py b/Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py similarity index 97% rename from Examples/Physics_applications/capacitive_discharge/PICMI_inputs_1d.py rename to Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py index 8b58790d2e6..01e789ac0a3 100644 --- a/Examples/Physics_applications/capacitive_discharge/PICMI_inputs_1d.py +++ b/Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py @@ -350,14 +350,6 @@ def setup_run(self): # Add diagnostics for the CI test to be happy # ####################################################################### - if self.dsmc: - file_prefix = 'Python_dsmc_1d_plt' - else: - if self.pythonsolver: - file_prefix = 'Python_background_mcc_1d_plt' - else: - file_prefix = 'Python_background_mcc_1d_tridiag_plt' - species = [self.electrons, self.ions] if self.dsmc: species.append(self.neutrals) @@ -365,16 +357,12 @@ def setup_run(self): species=species, name='diag1', period=0, - write_dir='.', - warpx_file_prefix=file_prefix ) field_diag = picmi.FieldDiagnostic( name='diag1', grid=self.grid, period=0, data_list=['rho_electrons', 'rho_he_ions'], - write_dir='.', - warpx_file_prefix=file_prefix ) self.sim.add_diagnostic(particle_diag) self.sim.add_diagnostic(field_diag) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 48f9607feed..be189b89e30 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -37,6 +37,7 @@ add_subdirectory(nuclear_fusion) add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) add_subdirectory(nodal_electrostatic) +add_subdirectory(ohm_solver_em_modes) add_subdirectory(open_bc_poisson_solver) add_subdirectory(particle_boundary_interaction) add_subdirectory(particle_boundary_process) diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt new file mode 100644 index 00000000000..548563b8632 --- /dev/null +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -0,0 +1,30 @@ +# Add tests (alphabetical order) ############################################## +# + +# FIXME +# ohm_solver_em_modes_1d_picmi ################################################ +# +#add_warpx_test( +# ohm_solver_em_modes_1d_picmi # name +# 1 # dims +# 2 # nprocs +# OFF # eb +# Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py # inputs +# Examples/Tests/ohm_solver_em_modes/analysis.py # analysis +# diags/field_diag000250 # output +# "--test --dim 1 --bdir z" # optional command-line arguments +#) + +# FIXME +# ohm_solver_em_modes_rz_picmi ################################################ +# +#add_warpx_test( +# ohm_solver_em_modes_rz_picmi # name +# RZ # dims +# 2 # nprocs +# OFF # eb +# Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py # inputs +# Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis +# diags/diag1000100 # output +# "--test" # optional command-line arguments +#) diff --git a/Examples/Tests/ohm_solver_EM_modes/README.rst b/Examples/Tests/ohm_solver_em_modes/README.rst similarity index 100% rename from Examples/Tests/ohm_solver_EM_modes/README.rst rename to Examples/Tests/ohm_solver_em_modes/README.rst diff --git a/Examples/Tests/ohm_solver_EM_modes/analysis.py b/Examples/Tests/ohm_solver_em_modes/analysis.py similarity index 100% rename from Examples/Tests/ohm_solver_EM_modes/analysis.py rename to Examples/Tests/ohm_solver_em_modes/analysis.py diff --git a/Examples/Tests/ohm_solver_EM_modes/analysis_rz.py b/Examples/Tests/ohm_solver_em_modes/analysis_rz.py similarity index 100% rename from Examples/Tests/ohm_solver_EM_modes/analysis_rz.py rename to Examples/Tests/ohm_solver_em_modes/analysis_rz.py diff --git a/Examples/Tests/ohm_solver_EM_modes/PICMI_inputs.py b/Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py similarity index 98% rename from Examples/Tests/ohm_solver_EM_modes/PICMI_inputs.py rename to Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py index a14787fc8e5..7246e6146d9 100644 --- a/Examples/Tests/ohm_solver_EM_modes/PICMI_inputs.py +++ b/Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py @@ -259,8 +259,6 @@ def setup_run(self): particle_diag = picmi.ParticleDiagnostic( name='field_diag', period=self.total_steps, - write_dir='.', - warpx_file_prefix='Python_ohms_law_solver_EM_modes_1d_plt', # warpx_format = 'openpmd', # warpx_openpmd_backend = 'h5' ) @@ -270,8 +268,6 @@ def setup_run(self): grid=self.grid, period=self.total_steps, data_list=['B', 'E', 'J_displacement'], - write_dir='.', - warpx_file_prefix='Python_ohms_law_solver_EM_modes_1d_plt', # warpx_format = 'openpmd', # warpx_openpmd_backend = 'h5' ) diff --git a/Examples/Tests/ohm_solver_EM_modes/PICMI_inputs_rz.py b/Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py similarity index 98% rename from Examples/Tests/ohm_solver_EM_modes/PICMI_inputs_rz.py rename to Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py index 9d5cc8fe977..751da14bb6f 100644 --- a/Examples/Tests/ohm_solver_EM_modes/PICMI_inputs_rz.py +++ b/Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py @@ -223,8 +223,6 @@ def setup_run(self): period=self.total_steps, species=[self.ions], data_list=['ux', 'uy', 'uz', 'weighting'], - write_dir='.', - warpx_file_prefix='Python_ohms_law_solver_EM_modes_rz_plt' ) simulation.add_diagnostic(part_diag) diff --git a/Regression/Checksum/benchmarks_json/Python_dsmc_1d.json b/Regression/Checksum/benchmarks_json/dsmc_1d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_dsmc_1d.json rename to Regression/Checksum/benchmarks_json/dsmc_1d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_ohms_law_solver_EM_modes_1d.json b/Regression/Checksum/benchmarks_json/ohm_solver_em_modes_1d_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ohms_law_solver_EM_modes_1d.json rename to Regression/Checksum/benchmarks_json/ohm_solver_em_modes_1d_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_ohms_law_solver_EM_modes_rz.json b/Regression/Checksum/benchmarks_json/ohm_solver_em_modes_rz_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ohms_law_solver_EM_modes_rz.json rename to Regression/Checksum/benchmarks_json/ohm_solver_em_modes_rz_picmi.json From 1d92ce393db172d09b296ab1ca52f29ecdcde85c Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 20 Aug 2024 16:45:03 -0700 Subject: [PATCH 103/167] Add more tests --- Examples/Physics_applications/CMakeLists.txt | 3 ++ .../beam-beam_collision/CMakeLists.txt | 14 +++++++ ...uts => inputs_3d_test_beam_beam_collision} | 0 .../spacecraft_charging/CMakeLists.txt | 16 ++++++++ .../spacecraft_charging/analysis.py | 2 +- ...puts_rz_test_spacecraft_charging_picmi.py} | 4 -- .../uniform_plasma/CMakeLists.txt | 38 +++++++++++++++++++ ...ts_2d => inputs_2d_test_uniform_plasma_2d} | 0 .../{inputs_3d => inputs_3d_base} | 0 .../inputs_3d_test_uniform_plasma_3d | 2 + .../inputs_3d_test_uniform_plasma_3d_restart | 5 +++ .../Tests/nci_psatd_stability/CMakeLists.txt | 14 +++++++ .../inputs_3d_test_uniform_plasma_multiJ | 13 +++++++ .../TwoParticle_electrostatic.json | 26 ------------- ...ollision.json => beam_beam_collision.json} | 0 ...Uniform_2d.json => uniform_plasma_2d.json} | 0 ...ma_restart.json => uniform_plasma_3d.json} | 0 17 files changed, 106 insertions(+), 31 deletions(-) create mode 100644 Examples/Physics_applications/beam-beam_collision/CMakeLists.txt rename Examples/Physics_applications/beam-beam_collision/{inputs => inputs_3d_test_beam_beam_collision} (100%) create mode 100644 Examples/Physics_applications/spacecraft_charging/CMakeLists.txt rename Examples/Physics_applications/spacecraft_charging/{PICMI_inputs_rz.py => inputs_rz_test_spacecraft_charging_picmi.py} (98%) create mode 100644 Examples/Physics_applications/uniform_plasma/CMakeLists.txt rename Examples/Physics_applications/uniform_plasma/{inputs_2d => inputs_2d_test_uniform_plasma_2d} (100%) rename Examples/Physics_applications/uniform_plasma/{inputs_3d => inputs_3d_base} (100%) create mode 100644 Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d create mode 100644 Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart create mode 100644 Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ delete mode 100644 Regression/Checksum/benchmarks_json/TwoParticle_electrostatic.json rename Regression/Checksum/benchmarks_json/{BeamBeamCollision.json => beam_beam_collision.json} (100%) rename Regression/Checksum/benchmarks_json/{Uniform_2d.json => uniform_plasma_2d.json} (100%) rename Regression/Checksum/benchmarks_json/{uniform_plasma_restart.json => uniform_plasma_3d.json} (100%) diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index e33939d653a..c4d0e76d06b 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -1,8 +1,11 @@ # Add tests (alphabetical order) ############################################## # +add_subdirectory(beam-beam_collision) add_subdirectory(capacitive_discharge) add_subdirectory(laser_acceleration) add_subdirectory(laser_ion) add_subdirectory(plasma_acceleration) add_subdirectory(plasma_mirror) +add_subdirectory(spacecraft_charging) +add_subdirectory(uniform_plasma) diff --git a/Examples/Physics_applications/beam-beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam-beam_collision/CMakeLists.txt new file mode 100644 index 00000000000..eee45df17b2 --- /dev/null +++ b/Examples/Physics_applications/beam-beam_collision/CMakeLists.txt @@ -0,0 +1,14 @@ +# Add tests (alphabetical order) ############################################## +# + +# beam_beam_collision ######################################################### +# +add_warpx_test( + beam_beam_collision # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision # inputs + Examples/analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output +) diff --git a/Examples/Physics_applications/beam-beam_collision/inputs b/Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision similarity index 100% rename from Examples/Physics_applications/beam-beam_collision/inputs rename to Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt new file mode 100644 index 00000000000..a2f4cf7b404 --- /dev/null +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -0,0 +1,16 @@ +# Add tests (alphabetical order) ############################################## +# + +# spacecraft_charging ######################################################### +# +if(WarpX_EB) +add_warpx_test( + spacecraft_charging # name + RZ # dims + 2 # nprocs + ON # eb + Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py # inputs + Examples/Physics_applications/spacecraft_charging/analysis.py # analysis + diags/diag1/ # output +) +endif() diff --git a/Examples/Physics_applications/spacecraft_charging/analysis.py b/Examples/Physics_applications/spacecraft_charging/analysis.py index ef75fd1a10a..d6397f36763 100755 --- a/Examples/Physics_applications/spacecraft_charging/analysis.py +++ b/Examples/Physics_applications/spacecraft_charging/analysis.py @@ -30,7 +30,7 @@ test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename, output_format='openpmd') -ts = OpenPMDTimeSeries('./spacecraft_charging_plt') +ts = OpenPMDTimeSeries(filename) dt = 1.27e-8 t=[] phi=[] diff --git a/Examples/Physics_applications/spacecraft_charging/PICMI_inputs_rz.py b/Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py similarity index 98% rename from Examples/Physics_applications/spacecraft_charging/PICMI_inputs_rz.py rename to Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py index 5b57b59fbe3..ffa1efc779e 100644 --- a/Examples/Physics_applications/spacecraft_charging/PICMI_inputs_rz.py +++ b/Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py @@ -247,16 +247,12 @@ def compute_actual_charge_on_spacecraft(): data_list = ['Er', 'Ez', 'phi', 'rho', 'rho_electrons', 'rho_protons'], warpx_format = 'openpmd', - write_dir = '.', - warpx_file_prefix = 'spacecraft_charging_plt' ) part_diag = picmi.ParticleDiagnostic(name = 'diag1', period = diagnostic_interval, species = [electrons, protons], warpx_format = 'openpmd', - write_dir = '.', - warpx_file_prefix = 'spacecraft_charging_plt' ) ########################## diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt new file mode 100644 index 00000000000..dfb6f7dbd8e --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -0,0 +1,38 @@ +# Add tests (alphabetical order) ############################################## +# + +# uniform_plasma_2d ########################################################### +# +add_warpx_test( + uniform_plasma_2d # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# uniform_plasma_3d ########################################################### +# +add_warpx_test( + uniform_plasma_3d # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) + +# uniform_plasma_3d_restart ################################################### +# +add_warpx_test( + uniform_plasma_3d_restart # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000010 # output +) diff --git a/Examples/Physics_applications/uniform_plasma/inputs_2d b/Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d similarity index 100% rename from Examples/Physics_applications/uniform_plasma/inputs_2d rename to Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d b/Examples/Physics_applications/uniform_plasma/inputs_3d_base similarity index 100% rename from Examples/Physics_applications/uniform_plasma/inputs_3d rename to Examples/Physics_applications/uniform_plasma/inputs_3d_base diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d b/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d new file mode 100644 index 00000000000..287576a9c7f --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_3d_base diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart b/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart new file mode 100644 index 00000000000..e2011f43f91 --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +amr.restart = ../uniform_plasma_3d/diags/chk000006 diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 266afb5ca3f..13bdc51cb41 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -224,3 +224,17 @@ if(WarpX_FFT) diags/diag1000050 # output ) endif() + +# uniform_plasma_multiJ ####################################################### +# +if(WarpX_FFT) + add_warpx_test( + uniform_plasma_multiJ # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ # inputs + Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis + diags/diag1000300 # output + ) +endif() diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ b/Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ new file mode 100644 index 00000000000..41778983f47 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ @@ -0,0 +1,13 @@ +# base input parameters +FILE = inputs_3d_base + +# test input parameters +diag1.fields_to_plot = Bx By Bz divE Ex Ey Ez F G jx jy jz rho +psatd.J_in_time = constant +psatd.rho_in_time = constant +psatd.solution_type = first-order +warpx.abort_on_warning_threshold = medium +warpx.do_divb_cleaning = 1 +warpx.do_dive_cleaning = 1 +warpx.do_multi_J = 1 +warpx.do_multi_J_n_depositions = 1 diff --git a/Regression/Checksum/benchmarks_json/TwoParticle_electrostatic.json b/Regression/Checksum/benchmarks_json/TwoParticle_electrostatic.json deleted file mode 100644 index aaf04f8a74c..00000000000 --- a/Regression/Checksum/benchmarks_json/TwoParticle_electrostatic.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "electron1": { - "particle_momentum_x": 3.346088201352191e-29, - "particle_momentum_y": 3.346088199932699e-29, - "particle_momentum_z": 3.3460881978884573e-29, - "particle_position_x": 0.1545496421786394, - "particle_position_y": 0.15454964213891717, - "particle_position_z": 0.15454964208395047, - "particle_weight": 1.0 - }, - "electron2": { - "particle_momentum_x": 3.346088199424244e-29, - "particle_momentum_y": 3.346088202432085e-29, - "particle_momentum_z": 3.346088202108714e-29, - "particle_position_x": 0.15454964215048347, - "particle_position_y": 0.15454964222866666, - "particle_position_z": 0.15454964222208387, - "particle_weight": 1.0 - }, - "lev=0": { - "Ex": 7.101527209952963e-05, - "Ey": 7.10152721046017e-05, - "Ez": 7.101527211163835e-05, - "rho": 1.3125030985727997e-15 - } -} \ No newline at end of file diff --git a/Regression/Checksum/benchmarks_json/BeamBeamCollision.json b/Regression/Checksum/benchmarks_json/beam_beam_collision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/BeamBeamCollision.json rename to Regression/Checksum/benchmarks_json/beam_beam_collision.json diff --git a/Regression/Checksum/benchmarks_json/Uniform_2d.json b/Regression/Checksum/benchmarks_json/uniform_plasma_2d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Uniform_2d.json rename to Regression/Checksum/benchmarks_json/uniform_plasma_2d.json diff --git a/Regression/Checksum/benchmarks_json/uniform_plasma_restart.json b/Regression/Checksum/benchmarks_json/uniform_plasma_3d.json similarity index 100% rename from Regression/Checksum/benchmarks_json/uniform_plasma_restart.json rename to Regression/Checksum/benchmarks_json/uniform_plasma_3d.json From 67e3ee24b2cf5fcc12ea3a793be615a41a4d6416 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 21 Aug 2024 15:00:58 -0700 Subject: [PATCH 104/167] Cleanup --- Examples/CMakeLists.txt | 12 +- .../inputs_2d_test_dive_cleaning_2d | 36 ++++- Examples/Tests/dive_cleaning/inputs_3d_base | 34 ----- .../inputs_3d_test_dive_cleaning_3d | 36 ++++- .../laser_injection_from_file/CMakeLists.txt | 133 +++++++++--------- 5 files changed, 145 insertions(+), 106 deletions(-) delete mode 100644 Examples/Tests/dive_cleaning/inputs_3d_base diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 9d19c868640..84517f92efa 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -72,11 +72,17 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) - # copy local input files to run directory + #file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*" "${INPUTS_DIR}/*.py") + #file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) + # copy test input files to run directory get_filename_component(INPUTS_PATH ${inputs} REALPATH BASE_DIR "${CMAKE_BINARYDIR}") + file(COPY ${INPUTS_PATH} DESTINATION ${THIS_WORKING_DIR}) + # copy base input files to run directory get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) - file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*" "${INPUTS_DIR}/*.py") - file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) + set(INPUTS_BASE ${INPUTS_DIR}/inputs_${SD}_base) + if(EXISTS ${INPUTS_BASE}) + file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) + endif() set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} diff --git a/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d b/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d index a02b4f1d2cd..48cabee4495 100644 --- a/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d +++ b/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d @@ -1,5 +1,35 @@ -# base input parameters -FILE = inputs_3d_base +max_step = 128 +amr.n_cell = 64 64 +amr.max_grid_size = 32 +amr.max_level = 0 -# test input parameters +geometry.prob_lo = -50.e-6 -50.e-6 +geometry.prob_hi = 50.e-6 50.e-6 geometry.dims = 2 + +boundary.field_lo = pml pml +boundary.field_hi = pml pml + +warpx.do_dive_cleaning = 1 +warpx.use_filter = 0 + +# Order of particle shape factors +algo.particle_shape = 1 + +particles.species_names = beam +beam.charge = -q_e +beam.mass = 1.e30 +beam.injection_style = "gaussian_beam" +beam.x_rms = 2.e-6 +beam.y_rms = 2.e-6 +beam.z_rms = 2.e-6 +beam.x_m = 0. +beam.y_m = 0. +beam.z_m = 0.e-6 +beam.npart = 20000 +beam.q_tot = -1.e-20 +beam.momentum_distribution_type = "at_rest" + +diagnostics.diags_names = diag1 +diag1.intervals = 8 +diag1.diag_type = Full diff --git a/Examples/Tests/dive_cleaning/inputs_3d_base b/Examples/Tests/dive_cleaning/inputs_3d_base deleted file mode 100644 index c7fc0616d30..00000000000 --- a/Examples/Tests/dive_cleaning/inputs_3d_base +++ /dev/null @@ -1,34 +0,0 @@ -max_step = 128 -amr.n_cell = 64 64 64 -amr.max_grid_size = 32 -amr.max_level = 0 - -geometry.prob_lo = -50.e-6 -50.e-6 -50.e-6 -geometry.prob_hi = 50.e-6 50.e-6 50.e-6 - -boundary.field_lo = pml pml pml -boundary.field_hi = pml pml pml - -warpx.do_dive_cleaning = 1 -warpx.use_filter = 0 - -# Order of particle shape factors -algo.particle_shape = 1 - -particles.species_names = beam -beam.charge = -q_e -beam.mass = 1.e30 -beam.injection_style = "gaussian_beam" -beam.x_rms = 2.e-6 -beam.y_rms = 2.e-6 -beam.z_rms = 2.e-6 -beam.x_m = 0. -beam.y_m = 0. -beam.z_m = 0.e-6 -beam.npart = 20000 -beam.q_tot = -1.e-20 -beam.momentum_distribution_type = "at_rest" - -diagnostics.diags_names = diag1 -diag1.intervals = 8 -diag1.diag_type = Full diff --git a/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d b/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d index 7e1209ababb..3f22a2206cf 100644 --- a/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d +++ b/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d @@ -1,5 +1,35 @@ -# base input parameters -FILE = inputs_3d_base +max_step = 128 +amr.n_cell = 64 64 64 +amr.max_grid_size = 32 +amr.max_level = 0 -# test input parameters +geometry.prob_lo = -50.e-6 -50.e-6 -50.e-6 +geometry.prob_hi = 50.e-6 50.e-6 50.e-6 geometry.dims = 3 + +boundary.field_lo = pml pml pml +boundary.field_hi = pml pml pml + +warpx.do_dive_cleaning = 1 +warpx.use_filter = 0 + +# Order of particle shape factors +algo.particle_shape = 1 + +particles.species_names = beam +beam.charge = -q_e +beam.mass = 1.e30 +beam.injection_style = "gaussian_beam" +beam.x_rms = 2.e-6 +beam.y_rms = 2.e-6 +beam.z_rms = 2.e-6 +beam.x_m = 0. +beam.y_m = 0. +beam.z_m = 0.e-6 +beam.npart = 20000 +beam.q_tot = -1.e-20 +beam.momentum_distribution_type = "at_rest" + +diagnostics.diags_names = diag1 +diag1.intervals = 8 +diag1.diag_type = Full diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 8c2fd895a05..48ddd099606 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -1,86 +1,93 @@ # Add tests (alphabetical order) ############################################## # +# FIXME # laser_injection_from_binary_file ############################################ # -add_warpx_test( - laser_injection_from_binary_file # name - 2 # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs - Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_binary_file # name +# 2 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs +# Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_lasy_file_1d ########################################### # -add_warpx_test( - laser_injection_from_lasy_file_1d # name - 1 # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs - Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_lasy_file_1d # name +# 1 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs +# Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_lasy_file_1d_boost ##################################### # -add_warpx_test( - laser_injection_from_lasy_file_1d_boost # name - 1 # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs - Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_lasy_file_1d_boost # name +# 1 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs +# Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_lasy_file_2d ########################################### # -add_warpx_test( - laser_injection_from_lasy_file_2d # name - 2 # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs - Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_lasy_file_2d # name +# 2 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs +# Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_lasy_file_3d ########################################### # -add_warpx_test( - laser_injection_from_lasy_file_3d # name - 3 # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs - Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_lasy_file_3d # name +# 3 # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs +# Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_lasy_file_rz ########################################### # -add_warpx_test( - laser_injection_from_lasy_file_rz # name - RZ # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs - Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_lasy_file_rz # name +# RZ # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs +# Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis +# diags/diag1000250 # output +#) +# FIXME # laser_injection_from_rz_lasy_file ########################################### # -add_warpx_test( - laser_injection_from_rz_lasy_file # name - RZ # dims - 1 # nprocs - OFF # eb - Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis - diags/diag1000250 # output -) +#add_warpx_test( +# laser_injection_from_rz_lasy_file # name +# RZ # dims +# 1 # nprocs +# OFF # eb +# Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs +# Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis +# diags/diag1000250 # output +#) From 63fd72025d949b851a253ac20e9f72ddc3ec36d4 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 21 Aug 2024 17:34:06 -0700 Subject: [PATCH 105/167] Cleanup --- .github/workflows/clang_sanitizers.yml | 18 +- .github/workflows/insitu.yml | 4 +- .github/workflows/intel.yml | 2 +- .github/workflows/macos.yml | 2 +- .../scripts/checkQEDTableGenerator.sh | 4 +- .github/workflows/ubuntu.yml | 14 +- .github/workflows/windows.yml | 4 +- Examples/CMakeLists.txt | 2 +- Examples/Physics_applications/CMakeLists.txt | 2 +- .../CMakeLists.txt | 6 +- .../README.rst | 0 .../inputs_test_3d_beam_beam_collision} | 0 .../capacitive_discharge/CMakeLists.txt | 30 +-- .../inputs_2d_test_background_mcc | 5 - ..._base_picmi.py => inputs_base_1d_picmi.py} | 0 ..._2d_base => inputs_test_2d_background_mcc} | 1 + ...=> inputs_test_2d_background_mcc_picmi.py} | 0 .../laser_acceleration/CMakeLists.txt | 84 +++---- .../{inputs_2d_base => inputs_base_2d} | 0 .../{inputs_3d_base => inputs_base_3d} | 0 .../{inputs_rz_base => inputs_base_rz} | 0 ...n_1d => inputs_test_1d_laser_acceleration} | 0 ...> inputs_test_1d_laser_acceleration_fluid} | 0 ..._test_1d_laser_acceleration_fluid_boosted} | 0 ...nputs_test_1d_laser_acceleration_picmi.py} | 0 ...inputs_test_2d_laser_acceleration_boosted} | 0 ...d => inputs_test_2d_laser_acceleration_mr} | 2 +- ...ts_test_2d_laser_acceleration_mr_picmi.py} | 0 ...ction => inputs_test_2d_refined_injection} | 2 +- .../inputs_test_3d_laser_acceleration} | 2 +- ...nputs_test_3d_laser_acceleration_picmi.py} | 0 ...laser_acceleration_single_precision_comms} | 2 +- ...n_rz => inputs_test_rz_laser_acceleration} | 2 +- ...=> inputs_test_rz_laser_acceleration_opmd} | 2 +- ...nputs_test_rz_laser_acceleration_picmi.py} | 0 .../laser_ion/CMakeLists.txt | 12 +- ...on_acc_2d => inputs_test_2d_laser_ion_acc} | 0 ... => inputs_test_2d_laser_ion_acc_picmi.py} | 0 .../plasma_acceleration/CMakeLists.txt | 48 ++-- .../{inputs_2d_base => inputs_base_2d} | 0 .../{inputs_3d_base => inputs_base_3d} | 0 ...puts_test_1d_plasma_acceleration_picmi.py} | 0 ...nputs_test_2d_plasma_acceleration_boosted} | 0 .../inputs_test_2d_plasma_acceleration_mr} | 2 +- ...lasma_acceleration_mr_momentum_conserving} | 2 +- ...nputs_test_3d_plasma_acceleration_boosted} | 2 +- ...est_3d_plasma_acceleration_boosted_hybrid} | 2 +- ...s_test_3d_plasma_acceleration_mr_picmi.py} | 0 ...puts_test_3d_plasma_acceleration_picmi.py} | 0 .../plasma_mirror/CMakeLists.txt | 6 +- ...ma_mirror => inputs_test_2d_plasma_mirror} | 0 .../spacecraft_charging/CMakeLists.txt | 6 +- ...puts_test_rz_spacecraft_charging_picmi.py} | 0 .../uniform_plasma/CMakeLists.txt | 18 +- .../inputs_3d_test_uniform_plasma_3d_restart | 5 - .../{inputs_3d_base => inputs_base_3d} | 0 ...lasma_2d => inputs_test_2d_uniform_plasma} | 0 .../inputs_test_3d_uniform_plasma} | 2 +- .../inputs_test_3d_uniform_plasma_restart | 5 + .../Tests/accelerator_lattice/CMakeLists.txt | 18 +- ... => inputs_test_3d_hard_edged_quadrupoles} | 0 ...ts_test_3d_hard_edged_quadrupoles_boosted} | 0 ...uts_test_3d_hard_edged_quadrupoles_moving} | 0 Examples/Tests/boosted_diags/CMakeLists.txt | 6 +- ... => inputs_test_3d_laser_acceleration_btd} | 0 Examples/Tests/boundaries/CMakeLists.txt | 6 +- ..._3d => inputs_test_3d_particle_boundaries} | 0 Examples/Tests/btd_rz/CMakeLists.txt | 8 +- ...lysis_btd_laser_antenna.py => analysis.py} | 0 ...puts_rz_test_btd_rz => inputs_test_rz_btd} | 0 .../collider_relevant_diags/CMakeLists.txt | 8 +- ...ysis_multiple_particles.py => analysis.py} | 2 +- ...cs => inputs_test_3d_collider_diagnostics} | 0 Examples/Tests/collision/CMakeLists.txt | 36 +-- ...collision_z => inputs_test_1d_collision_z} | 0 ...llision_xz => inputs_test_2d_collision_xz} | 0 ...y => inputs_test_2d_collision_xz_picmi.py} | 0 ...ision_iso => inputs_test_3d_collision_iso} | 0 ...ision_xyz => inputs_test_3d_collision_xyz} | 0 ..._collision_rz => inputs_test_rz_collision} | 0 Examples/Tests/divb_cleaning/CMakeLists.txt | 6 +- ...eaning_3d => inputs_test_3d_divb_cleaning} | 0 Examples/Tests/dive_cleaning/CMakeLists.txt | 12 +- ...eaning_2d => inputs_test_2d_dive_cleaning} | 0 ...eaning_3d => inputs_test_3d_dive_cleaning} | 0 .../electrostatic_dirichlet_bc/CMakeLists.txt | 12 +- ...richlet_bc => inputs_test_2d_dirichlet_bc} | 0 ...y => inputs_test_2d_dirichlet_bc_picmi.py} | 0 .../Tests/electrostatic_sphere/CMakeLists.txt | 30 +-- .../{inputs_3d_base => inputs_base_3d} | 0 ...re => inputs_test_3d_electrostatic_sphere} | 2 +- ...ts_test_3d_electrostatic_sphere_lab_frame} | 2 +- ...lectrostatic_sphere_lab_frame_mr_emass_10} | 2 +- ...ts_test_3d_electrostatic_sphere_rel_nodal} | 2 +- ...rz => inputs_test_rz_electrostatic_sphere} | 0 .../electrostatic_sphere_eb/CMakeLists.txt | 30 +-- ...=> inputs_test_3d_electrostatic_sphere_eb} | 0 ..._test_3d_electrostatic_sphere_eb_mixed_bc} | 0 ..._test_3d_electrostatic_sphere_eb_picmi.py} | 0 ...=> inputs_test_rz_electrostatic_sphere_eb} | 0 ...inputs_test_rz_electrostatic_sphere_eb_mr} | 0 .../embedded_boundary_cube/CMakeLists.txt | 18 +- .../{inputs_3d_base => inputs_base_3d} | 0 ... => inputs_test_2d_embedded_boundary_cube} | 0 ... => inputs_test_3d_embedded_boundary_cube} | 2 +- ...est_3d_embedded_boundary_cube_macroscopic} | 2 +- .../CMakeLists.txt | 6 +- ...uts_test_rz_embedded_boundary_diffraction} | 0 .../CMakeLists.txt | 6 +- ...inputs_test_3d_embedded_boundary_picmi.py} | 0 .../CMakeLists.txt | 12 +- ...ts_test_2d_embedded_boundary_rotated_cube} | 0 ...ts_test_3d_embedded_boundary_rotated_cube} | 0 Examples/Tests/embedded_circle/CMakeLists.txt | 6 +- ..._circle => inputs_test_2d_embedded_circle} | 0 .../CMakeLists.txt | 6 +- ..._test_2d_energy_conserving_thermal_plasma} | 0 Examples/Tests/field_probe/CMakeLists.txt | 8 +- .../{analysis_field_probe.py => analysis.py} | 0 ...field_probe => inputs_test_2d_field_probe} | 0 Examples/Tests/flux_injection/CMakeLists.txt | 12 +- ...ction_3d => inputs_test_3d_flux_injection} | 0 ...ction_rz => inputs_test_rz_flux_injection} | 0 Examples/Tests/gaussian_beam/CMakeLists.txt | 14 +- ...{analysis_focusing_beam.py => analysis.py} | 0 ... => inputs_test_3d_focusing_gaussian_beam} | 0 ... => inputs_test_3d_gaussian_beam_picmi.py} | 0 Examples/Tests/implicit/CMakeLists.txt | 36 ++- ...1d => inputs_test_1d_semi_implicit_picard} | 0 ...d => inputs_test_1d_theta_implicit_picard} | 0 ... inputs_test_2d_theta_implicit_jfnk_vandb} | 0 ...est_2d_theta_implicit_jfnk_vandb_picmi.py} | 0 .../Tests/initial_distribution/CMakeLists.txt | 8 +- .../{analysis_distribution.py => analysis.py} | 0 ...on => inputs_test_3d_initial_distribution} | 0 Examples/Tests/ion_stopping/CMakeLists.txt | 8 +- .../{analysis_ion_stopping.py => analysis.py} | 0 ...n_stopping => inputs_test_3d_ion_stopping} | 0 Examples/Tests/ionization/CMakeLists.txt | 24 +- .../{analysis_ionization.py => analysis.py} | 0 ..._boost => inputs_test_2d_ionization_boost} | 0 ...tion_lab => inputs_test_2d_ionization_lab} | 0 ....py => inputs_test_2d_ionization_picmi.py} | 0 Examples/Tests/langmuir/CMakeLists.txt | 210 ++++++------------ .../langmuir/inputs_3d_test_langmuir_multi_3d | 2 - .../{inputs_2d_base => inputs_base_2d} | 0 .../{inputs_3d_base => inputs_base_3d} | 0 .../{inputs_rz_base => inputs_base_rz} | 0 ...multi_1d => inputs_test_1d_langmuir_multi} | 0 ...2d_mr => inputs_test_2d_langmuir_multi_mr} | 2 +- ...uts_test_2d_langmuir_multi_mr_anisotropic} | 2 +- ..._2d_langmuir_multi_mr_momentum_conserving} | 2 +- ...=> inputs_test_2d_langmuir_multi_mr_psatd} | 2 +- ...al => inputs_test_2d_langmuir_multi_nodal} | 2 +- ...=> inputs_test_2d_langmuir_multi_picmi.py} | 0 ...td => inputs_test_2d_langmuir_multi_psatd} | 2 +- ...d_langmuir_multi_psatd_current_correction} | 2 +- ...muir_multi_psatd_current_correction_nodal} | 2 +- ..._langmuir_multi_psatd_momentum_conserving} | 2 +- ...nputs_test_2d_langmuir_multi_psatd_multiJ} | 2 +- ...test_2d_langmuir_multi_psatd_multiJ_nodal} | 2 +- ...inputs_test_2d_langmuir_multi_psatd_nodal} | 2 +- ...st_2d_langmuir_multi_psatd_vay_deposition} | 2 +- ...langmuir_multi_psatd_vay_deposition_nodal} | 2 +- ...lti_psatd_vay_deposition_particle_shape_4} | 2 +- .../langmuir/inputs_test_3d_langmuir_multi | 2 + ...al => inputs_test_3d_langmuir_multi_nodal} | 2 +- ...=> inputs_test_3d_langmuir_multi_picmi.py} | 0 ...td => inputs_test_3d_langmuir_multi_psatd} | 2 +- ...d_langmuir_multi_psatd_current_correction} | 2 +- ...muir_multi_psatd_current_correction_nodal} | 2 +- ...test_3d_langmuir_multi_psatd_div_cleaning} | 2 +- ..._langmuir_multi_psatd_momentum_conserving} | 2 +- ...nputs_test_3d_langmuir_multi_psatd_multiJ} | 2 +- ...test_3d_langmuir_multi_psatd_multiJ_nodal} | 2 +- ...inputs_test_3d_langmuir_multi_psatd_nodal} | 2 +- ...st_3d_langmuir_multi_psatd_vay_deposition} | 2 +- ...langmuir_multi_psatd_vay_deposition_nodal} | 2 +- ...multi_rz => inputs_test_rz_langmuir_multi} | 2 +- ...=> inputs_test_rz_langmuir_multi_picmi.py} | 0 ...td => inputs_test_rz_langmuir_multi_psatd} | 2 +- ...z_langmuir_multi_psatd_current_correction} | 2 +- ...nputs_test_rz_langmuir_multi_psatd_multiJ} | 2 +- Examples/Tests/langmuir_fluids/CMakeLists.txt | 24 +- ...fluid_1d => inputs_test_1d_langmuir_fluid} | 0 ...fluid_2d => inputs_test_2d_langmuir_fluid} | 0 ...fluid_3d => inputs_test_3d_langmuir_fluid} | 0 ...fluid_rz => inputs_test_rz_langmuir_fluid} | 0 Examples/Tests/larmor/CMakeLists.txt | 6 +- ...s_2d_test_larmor => inputs_test_2d_larmor} | 0 Examples/Tests/laser_injection/CMakeLists.txt | 18 +- ...tion_1d => inputs_test_1d_laser_injection} | 0 ...tion_2d => inputs_test_2d_laser_injection} | 0 ...tion_3d => inputs_test_3d_laser_injection} | 0 .../laser_injection_from_file/CMakeLists.txt | 42 ++-- ...ts_test_1d_laser_injection_from_lasy_file} | 0 ...t_1d_laser_injection_from_lasy_file_boost} | 0 ..._test_2d_laser_injection_from_binary_file} | 0 ...ts_test_2d_laser_injection_from_lasy_file} | 0 ...ts_test_3d_laser_injection_from_lasy_file} | 0 ...test_rz_laser_injection_from_RZ_lasy_file} | 0 ...ts_test_rz_laser_injection_from_lasy_file} | 0 Examples/Tests/laser_on_fine/CMakeLists.txt | 6 +- ...r_on_fine => inputs_test_2d_laser_on_fine} | 0 .../Tests/load_external_field/CMakeLists.txt | 36 +-- ...z_test_load_external_field_rz_grid_restart | 5 - ...t_load_external_field_rz_particles_restart | 5 - ...test_3d_load_external_field_grid_picmi.py} | 0 ..._3d_load_external_field_particle_picmi.py} | 0 ...> inputs_test_rz_load_external_field_grid} | 0 ...s_test_rz_load_external_field_grid_restart | 5 + ...uts_test_rz_load_external_field_particles} | 0 ...t_rz_load_external_field_particles_restart | 5 + .../Tests/magnetostatic_eb/CMakeLists.txt | 18 +- ..._eb_3d => inputs_test_3d_magnetostatic_eb} | 0 ... inputs_test_3d_magnetostatic_eb_picmi.py} | 0 ... inputs_test_rz_magnetostatic_eb_picmi.py} | 0 .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 6 +- ... inputs_test_2d_maxwell_hybrid_qed_solver} | 0 .../Tests/nci_fdtd_stability/CMakeLists.txt | 12 +- .../{inputs_2d_base => inputs_base_2d} | 0 ...corrector => inputs_test_2d_nci_corrector} | 2 +- ...tor_mr => inputs_test_2d_nci_corrector_mr} | 2 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 102 +++------ .../{inputs_2d_base => inputs_base_2d} | 0 ...ts_avg_2d_base => inputs_base_2d_averaged} | 0 .../{inputs_3d_base => inputs_base_3d} | 0 ...ts_avg_3d_base => inputs_base_3d_averaged} | 0 .../{inputs_rz_base => inputs_base_rz} | 0 ...=> inputs_test_2d_averaged_galilean_psatd} | 2 +- ...ts_test_2d_averaged_galilean_psatd_hybrid} | 2 +- ...d => inputs_test_2d_comoving_psatd_hybrid} | 0 ...2d_psatd => inputs_test_2d_galilean_psatd} | 2 +- ...test_2d_galilean_psatd_current_correction} | 2 +- ..._2d_galilean_psatd_current_correction_psb} | 2 +- ...d => inputs_test_2d_galilean_psatd_hybrid} | 0 ...=> inputs_test_3d_averaged_galilean_psatd} | 2 +- ...ts_test_3d_averaged_galilean_psatd_hybrid} | 2 +- ...3d_psatd => inputs_test_3d_galilean_psatd} | 2 +- ...test_3d_galilean_psatd_current_correction} | 2 +- ..._3d_galilean_psatd_current_correction_psb} | 2 +- ...J => inputs_test_3d_uniform_plasma_multiJ} | 2 +- ...rz_psatd => inputs_test_rz_galilean_psatd} | 2 +- ...test_rz_galilean_psatd_current_correction} | 2 +- ..._rz_galilean_psatd_current_correction_psb} | 2 +- ...J_rz_psatd => inputs_test_rz_multiJ_psatd} | 0 .../Tests/nodal_electrostatic/CMakeLists.txt | 8 +- .../{analysis_3d.py => analysis.py} | 0 ...inputs_test_3d_nodal_electrostatic_solver} | 0 Examples/Tests/nuclear_fusion/CMakeLists.txt | 36 +-- ..._2d => inputs_test_2d_proton_boron_fusion} | 0 ...inputs_test_3d_deuterium_deuterium_fusion} | 0 ...d_deuterium_deuterium_fusion_intraspecies} | 0 ...> inputs_test_3d_deuterium_tritium_fusion} | 0 ..._3d => inputs_test_3d_proton_boron_fusion} | 0 ...> inputs_test_rz_deuterium_tritium_fusion} | 0 .../Tests/ohm_solver_em_modes/CMakeLists.txt | 12 +- ...puts_test_1d_ohm_solver_em_modes_picmi.py} | 0 ...puts_test_rz_ohm_solver_em_modes_picmi.py} | 0 .../open_bc_poisson_solver/CMakeLists.txt | 6 +- ... => inputs_test_3d_open_bc_poisson_solver} | 0 .../CMakeLists.txt | 6 +- ...rz_particle_boundary_interaction_picmi.py} | 0 .../particle_boundary_process/CMakeLists.txt | 12 +- ...puts_test_2d_particle_reflection_picmi.py} | 0 ...ion => inputs_test_3d_particle_absorption} | 0 .../particle_boundary_scrape/CMakeLists.txt | 12 +- ..._scrape => inputs_test_3d_particle_scrape} | 0 ...> inputs_test_3d_particle_scrape_picmi.py} | 0 .../Tests/particle_data_python/CMakeLists.txt | 18 +- ...uts_test_2d_particle_attr_access_picmi.py} | 0 ...=> inputs_test_2d_prev_positions_picmi.py} | 0 .../particle_fields_diags/CMakeLists.txt | 12 +- ...s => inputs_test_3d_particle_fields_diags} | 0 Examples/Tests/particle_pusher/CMakeLists.txt | 8 +- .../{analysis_pusher.py => analysis.py} | 0 ..._pusher => inputs_test_3d_particle_pusher} | 0 .../particle_thermal_boundary/CMakeLists.txt | 8 +- .../{analysis_2d.py => analysis.py} | 0 ... inputs_test_2d_particle_thermal_boundary} | 0 .../Tests/particles_in_pml/CMakeLists.txt | 24 +- ...pml_2d => inputs_test_2d_particles_in_pml} | 0 ..._mr => inputs_test_2d_particles_in_pml_mr} | 0 ...pml_3d => inputs_test_3d_particles_in_pml} | 0 ..._mr => inputs_test_3d_particles_in_pml_mr} | 0 .../pass_mpi_communicator/CMakeLists.txt | 6 +- ... => inputs_test_2d_pass_mpi_comm_picmi.py} | 0 Examples/Tests/pec/CMakeLists.txt | 18 +- ...est_pec_field => inputs_test_3d_pec_field} | 0 ...c_field_mr => inputs_test_3d_pec_field_mr} | 0 ...c_particle => inputs_test_3d_pec_particle} | 0 Examples/Tests/photon_pusher/CMakeLists.txt | 8 +- ...{analysis_photon_pusher.py => analysis.py} | 0 ...on_pusher => inputs_test_3d_photon_pusher} | 0 Examples/Tests/plasma_lens/CMakeLists.txt | 30 +-- ...plasma_lens => inputs_test_3d_plasma_lens} | 0 ...ted => inputs_test_3d_plasma_lens_boosted} | 0 ... => inputs_test_3d_plasma_lens_hard_edged} | 0 ...py => inputs_test_3d_plasma_lens_picmi.py} | 0 ...short => inputs_test_3d_plasma_lens_short} | 0 Examples/Tests/pml/CMakeLists.txt | 48 ++-- .../pml/inputs_2d_test_pml_x_psatd_restart | 5 - .../pml/inputs_2d_test_pml_x_yee_restart | 5 - .../pml/{inputs_2d_base => inputs_base_2d} | 0 ...est_pml_x_ckc => inputs_test_2d_pml_x_ckc} | 2 +- ...galilean => inputs_test_2d_pml_x_galilean} | 2 +- ...pml_x_psatd => inputs_test_2d_pml_x_psatd} | 2 +- .../pml/inputs_test_2d_pml_x_psatd_restart | 5 + ...est_pml_x_yee => inputs_test_2d_pml_x_yee} | 2 +- .../pml/inputs_test_2d_pml_x_yee_restart | 5 + ...puts_test_3d_pml_psatd_dive_divb_cleaning} | 0 ..._pml_psatd_rz => inputs_test_rz_pml_psatd} | 0 .../Tests/point_of_contact_eb/CMakeLists.txt | 12 +- ..._3d => inputs_test_3d_point_of_contact_eb} | 0 ..._rz => inputs_test_rz_point_of_contact_eb} | 0 Examples/Tests/python_wrappers/CMakeLists.txt | 6 +- ...> inputs_test_2d_python_wrappers_picmi.py} | 0 Examples/Tests/qed/CMakeLists.txt | 60 ++--- .../qed/inputs_2d_test_qed_breit_wheeler_2d | 2 - .../qed/inputs_3d_test_qed_breit_wheeler_3d | 2 - ...t_wheeler => inputs_base_2d_breit_wheeler} | 0 ...t_wheeler => inputs_base_3d_breit_wheeler} | 0 ...ase_schwinger => inputs_base_3d_schwinger} | 0 .../qed/inputs_test_2d_qed_breit_wheeler | 2 + ... => inputs_test_2d_qed_breit_wheeler_opmd} | 2 +- ...ync_2d => inputs_test_2d_qed_quantum_sync} | 0 .../qed/inputs_test_3d_qed_breit_wheeler | 2 + ... => inputs_test_3d_qed_breit_wheeler_opmd} | 2 +- ...ync_3d => inputs_test_3d_qed_quantum_sync} | 0 ...inger_1 => inputs_test_3d_qed_schwinger_1} | 2 +- ...inger_2 => inputs_test_3d_qed_schwinger_2} | 2 +- ...inger_3 => inputs_test_3d_qed_schwinger_3} | 2 +- ...inger_4 => inputs_test_3d_qed_schwinger_4} | 2 +- .../Tests/radiation_reaction/CMakeLists.txt | 6 +- ...tion => inputs_test_3d_radiation_reaction} | 0 Examples/Tests/reduced_diags/CMakeLists.txt | 30 +-- .../{inputs_3d_base => inputs_base_3d} | 0 ...ced_diags => inputs_test_3d_reduced_diags} | 0 ...educed_diags_load_balance_costs_heuristic} | 2 +- ...d_reduced_diags_load_balance_costs_timers} | 2 +- ..._diags_load_balance_costs_timers_picmi.py} | 0 ...ced_diags_load_balance_costs_timers_psatd} | 2 +- .../CMakeLists.txt | 6 +- ..._relativistic_space_charge_initialization} | 0 .../Tests/repelling_particles/CMakeLists.txt | 6 +- ...les => inputs_test_2d_repelling_particles} | 0 Examples/Tests/resampling/CMakeLists.txt | 18 +- ...1d_resample_velocity_coincidence_thinning} | 0 ...e_velocity_coincidence_thinning_cartesian} | 0 ...nning => inputs_test_2d_leveling_thinning} | 0 Examples/Tests/restart/CMakeLists.txt | 48 ++-- .../Tests/restart/inputs_3d_test_acceleration | 2 - .../inputs_3d_test_acceleration_psatd_restart | 5 - ...d_test_acceleration_psatd_time_avg_restart | 5 - .../inputs_3d_test_acceleration_restart | 5 - .../{inputs_3d_base => inputs_base_3d} | 0 ...py => inputs_test_2d_id_cpu_read_picmi.py} | 0 ...st_2d_restart_runtime_components_picmi.py} | 0 .../Tests/restart/inputs_test_3d_acceleration | 2 + ...satd => inputs_test_3d_acceleration_psatd} | 2 +- .../inputs_test_3d_acceleration_psatd_restart | 5 + ...nputs_test_3d_acceleration_psatd_time_avg} | 2 +- ...est_3d_acceleration_psatd_time_avg_restart | 5 + .../inputs_test_3d_acceleration_restart | 5 + Examples/Tests/rigid_injection/CMakeLists.txt | 12 +- ...btd => inputs_test_2d_rigid_injection_btd} | 0 ...lab => inputs_test_2d_rigid_injection_lab} | 0 Examples/Tests/scraping/CMakeLists.txt | 12 +- ..._test_scraping => inputs_test_rz_scraping} | 0 ..._filter => inputs_test_rz_scraping_filter} | 0 Examples/Tests/silver_mueller/CMakeLists.txt | 24 +- ...eller_1d => inputs_test_1d_silver_mueller} | 0 ...r_2d_x => inputs_test_2d_silver_mueller_x} | 0 ...r_2d_z => inputs_test_2d_silver_mueller_z} | 0 ...r_rz_z => inputs_test_rz_silver_mueller_z} | 0 Examples/Tests/single_particle/CMakeLists.txt | 8 +- ...nalysis_bilinear_filter.py => analysis.py} | 0 ..._filter => inputs_test_2d_bilinear_filter} | 0 .../CMakeLists.txt | 12 +- ...uts_3d_test_space_charge_initialization_2d | 5 - ...uts_3d_test_space_charge_initialization_3d | 2 - ...inputs_test_2d_space_charge_initialization | 37 +++ ...nputs_test_3d_space_charge_initialization} | 1 + Examples/Tests/subcycling/CMakeLists.txt | 6 +- ...ycling_mr => inputs_test_2d_subcycling_mr} | 0 Examples/Tests/vay_deposition/CMakeLists.txt | 12 +- ...ition_2d => inputs_test_2d_vay_deposition} | 0 ...ition_3d => inputs_test_3d_vay_deposition} | 0 ...lision_z.json => test_1d_collision_z.json} | 0 ..._1d_picmi.json => test_1d_dsmc_picmi.json} | 0 ...id_1d.json => test_1d_langmuir_fluid.json} | 0 ...ti_1d.json => test_1d_langmuir_multi.json} | 0 ...d.json => test_1d_laser_acceleration.json} | 0 ... => test_1d_laser_acceleration_fluid.json} | 0 ..._1d_laser_acceleration_fluid_boosted.json} | 0 ... => test_1d_laser_acceleration_picmi.json} | 0 ...n_1d.json => test_1d_laser_injection.json} | 0 ...st_1d_laser_injection_from_lasy_file.json} | 0 ...laser_injection_from_lasy_file_boost.json} | 0 ...est_1d_ohm_law_solver_ion_beam_picmi.json} | 0 ...=> test_1d_ohm_solver_em_modes_picmi.json} | 0 ...=> test_1d_plasma_acceleration_picmi.json} | 0 ...sample_velocity_coincidence_thinning.json} | 0 ...ocity_coincidence_thinning_cartesian.json} | 0 ...json => test_1d_semi_implicit_picard.json} | 0 ...er_1d.json => test_1d_silver_mueller.json} | 0 ...son => test_1d_theta_implicit_picard.json} | 0 ...n => test_2d_averaged_galilean_psatd.json} | 0 ...st_2d_averaged_galilean_psatd_hybrid.json} | 0 ...d_mcc.json => test_2d_background_mcc.json} | 0 ...son => test_2d_background_mcc_dp_psp.json} | 0 ...lter.json => test_2d_bilinear_filter.json} | 0 ...sion_xz.json => test_2d_collision_xz.json} | 0 ...son => test_2d_comoving_psatd_hybrid.json} | 0 ...ing_2d.json => test_2d_dive_cleaning.json} | 0 ...on => test_2d_embedded_boundary_cube.json} | 0 ...st_2d_embedded_boundary_rotated_cube.json} | 0 ...rcle.json => test_2d_embedded_circle.json} | 0 ..._2d_energy_conserving_thermal_plasma.json} | 0 ...psatd.json => test_2d_galilean_psatd.json} | 0 ...2d_galilean_psatd_current_correction.json} | 0 ...alilean_psatd_current_correction_psb.json} | 0 ...son => test_2d_galilean_psatd_hybrid.json} | 0 ...mi.json => test_2d_id_cpu_read_picmi.json} | 0 ...ost.json => test_2d_ionization_boost.json} | 0 ...n_lab.json => test_2d_ionization_lab.json} | 0 ...cmi.json => test_2d_ionization_picmi.json} | 0 ...id_2d.json => test_2d_langmuir_fluid.json} | 0 ...mr.json => test_2d_langmuir_multi_mr.json} | 0 ...est_2d_langmuir_multi_mr_anisotropic.json} | 0 ...angmuir_multi_mr_momentum_conserving.json} | 0 ...n => test_2d_langmuir_multi_mr_psatd.json} | 0 ...json => test_2d_langmuir_multi_nodal.json} | 0 ...json => test_2d_langmuir_multi_picmi.json} | 0 ...json => test_2d_langmuir_multi_psatd.json} | 0 ...gmuir_multi_psatd_current_correction.json} | 0 ...multi_psatd_current_correction_nodal.json} | 0 ...muir_multi_psatd_momentum_conserving.json} | 0 ... test_2d_langmuir_multi_psatd_multiJ.json} | 0 ...2d_langmuir_multi_psatd_multiJ_nodal.json} | 0 ...> test_2d_langmuir_multi_psatd_nodal.json} | 0 ..._langmuir_multi_psatd_vay_deposition.json} | 0 ...uir_multi_psatd_vay_deposition_nodal.json} | 0 ...satd_vay_deposition_particle_shape_4.json} | 0 .../{larmor.json => test_2d_larmor.json} | 0 ...> test_2d_laser_acceleration_boosted.json} | 0 ...son => test_2d_laser_acceleration_mr.json} | 0 ... test_2d_laser_acceleration_mr_picmi.json} | 0 ...n_2d.json => test_2d_laser_injection.json} | 0 ..._2d_laser_injection_from_binary_file.json} | 0 ...st_2d_laser_injection_from_lasy_file.json} | 0 ...acc_2d.json => test_2d_laser_ion_acc.json} | 0 ... test_2d_laser_ion_acc_no_field_diag.json} | 0 ....json => test_2d_laser_ion_acc_picmi.json} | 0 ...n_fine.json => test_2d_laser_on_fine.json} | 0 ...ng.json => test_2d_leveling_thinning.json} | 0 ...=> test_2d_maxwell_hybrid_qed_solver.json} | 0 ...rector.json => test_2d_nci_corrector.json} | 0 ..._mr.json => test_2d_nci_corrector_mr.json} | 0 ..._ohm_law_solver_landau_damping_picmi.json} | 0 ...w_solver_magnetic_reconnection_picmi.json} | 0 ...nnel_initialization_single_precision.json} | 0 ...=> test_2d_particle_thermal_boundary.json} | 0 ..._2d.json => test_2d_particles_in_pml.json} | 0 ....json => test_2d_particles_in_pml_mr.json} | 0 ... test_2d_plasma_acceleration_boosted.json} | 0 ...on => test_2d_plasma_acceleration_mr.json} | 0 ..._acceleration_mr_momentum_conserving.json} | 0 ...mirror.json => test_2d_plasma_mirror.json} | 0 ...{pml_x_ckc.json => test_2d_pml_x_ckc.json} | 0 ...ilean.json => test_2d_pml_x_galilean.json} | 0 ..._x_psatd.json => test_2d_pml_x_psatd.json} | 0 ...{pml_x_yee.json => test_2d_pml_x_yee.json} | 0 ..._yee_eb.json => test_2d_pml_x_yee_eb.json} | 0 ...json => test_2d_prev_positions_picmi.json} | 0 ....json => test_2d_proton_boron_fusion.json} | 0 ...son => test_2d_python_wrappers_picmi.json} | 0 ...2d.json => test_2d_qed_breit_wheeler.json} | 0 ..._2d.json => test_2d_qed_quantum_sync.json} | 0 ...on.json => test_2d_refined_injection.json} | 0 ....json => test_2d_repelling_particles.json} | 0 ....json => test_2d_rigid_injection_btd.json} | 0 ....json => test_2d_rigid_injection_lab.json} | 0 ...d_x.json => test_2d_silver_mueller_x.json} | 0 ...d_z.json => test_2d_silver_mueller_z.json} | 0 ... test_2d_space_charge_initialization.json} | 0 ...ing_mr.json => test_2d_subcycling_mr.json} | 0 ...=> test_2d_theta_implicit_jfnk_vandb.json} | 0 ...t_2d_theta_implicit_jfnk_vandb_picmi.json} | 0 ...ma_2d.json => test_2d_uniform_plasma.json} | 0 ...on_2d.json => test_2d_vay_deposition.json} | 0 ...eration.json => test_3d_acceleration.json} | 0 ...d.json => test_3d_acceleration_psatd.json} | 0 ... test_3d_acceleration_psatd_time_avg.json} | 0 ...n => test_3d_averaged_galilean_psatd.json} | 0 ...st_3d_averaged_galilean_psatd_hybrid.json} | 0 ....json => test_3d_beam_beam_collision.json} | 0 ...json => test_3d_collider_diagnostics.json} | 0 ...on_iso.json => test_3d_collision_iso.json} | 0 ...on_xyz.json => test_3d_collision_xyz.json} | 0 ...> test_3d_deuterium_deuterium_fusion.json} | 0 ...terium_deuterium_fusion_intraspecies.json} | 0 ... => test_3d_deuterium_tritium_fusion.json} | 0 ...ing_3d.json => test_3d_divb_cleaning.json} | 0 ...ing_3d.json => test_3d_dive_cleaning.json} | 0 ...json => test_3d_electrostatic_sphere.json} | 0 ...n => test_3d_electrostatic_sphere_eb.json} | 0 ..._3d_electrostatic_sphere_eb_mixed_bc.json} | 0 ...est_3d_electrostatic_sphere_eb_picmi.json} | 0 ...st_3d_electrostatic_sphere_lab_frame.json} | 0 ...ostatic_sphere_lab_frame_mr_emass_10.json} | 0 ...st_3d_electrostatic_sphere_rel_nodal.json} | 0 ...on => test_3d_embedded_boundary_cube.json} | 0 ...d_embedded_boundary_cube_macroscopic.json} | 0 ...st_3d_embedded_boundary_rotated_cube.json} | 0 ...on_3d.json => test_3d_flux_injection.json} | 0 ...on => test_3d_focusing_gaussian_beam.json} | 0 ...psatd.json => test_3d_galilean_psatd.json} | 0 ...3d_galilean_psatd_current_correction.json} | 0 ...alilean_psatd_current_correction_psb.json} | 0 ....json => test_3d_gaussian_beam_picmi.json} | 0 ...on => test_3d_hard_edged_quadrupoles.json} | 0 ...st_3d_hard_edged_quadrupoles_boosted.json} | 0 ...est_3d_hard_edged_quadrupoles_moving.json} | 0 ...json => test_3d_initial_distribution.json} | 0 ...topping.json => test_3d_ion_stopping.json} | 0 ...id_3d.json => test_3d_langmuir_fluid.json} | 0 ...ti_3d.json => test_3d_langmuir_multi.json} | 0 ...json => test_3d_langmuir_multi_nodal.json} | 0 ...json => test_3d_langmuir_multi_picmi.json} | 0 ...json => test_3d_langmuir_multi_psatd.json} | 0 ...gmuir_multi_psatd_current_correction.json} | 0 ...multi_psatd_current_correction_nodal.json} | 0 ...3d_langmuir_multi_psatd_div_cleaning.json} | 0 ...muir_multi_psatd_momentum_conserving.json} | 0 ... test_3d_langmuir_multi_psatd_multiJ.json} | 0 ...3d_langmuir_multi_psatd_multiJ_nodal.json} | 0 ...> test_3d_langmuir_multi_psatd_nodal.json} | 0 ...angmuir_multi_psatd_single_precision.json} | 0 ..._langmuir_multi_psatd_vay_deposition.json} | 0 ...uir_multi_psatd_vay_deposition_nodal.json} | 0 ...t_3d_langmuir_multi_single_precision.json} | 0 ...d.json => test_3d_laser_acceleration.json} | 0 ...on => test_3d_laser_acceleration_btd.json} | 0 ... => test_3d_laser_acceleration_picmi.json} | 0 ..._acceleration_single_precision_comms.json} | 0 ...n_3d.json => test_3d_laser_injection.json} | 0 ...st_3d_laser_injection_from_lasy_file.json} | 0 ...st_3d_load_external_field_grid_picmi.json} | 0 ...d_load_external_field_particle_picmi.json} | 0 ..._3d.json => test_3d_magnetostatic_eb.json} | 0 ...on => test_3d_magnetostatic_eb_picmi.json} | 0 ...> test_3d_nodal_electrostatic_solver.json} | 0 ...on => test_3d_open_bc_poisson_solver.json} | 0 ....json => test_3d_particle_boundaries.json} | 0 ...son => test_3d_particle_fields_diags.json} | 0 ...rticle_fields_diags_single_precision.json} | 0 ...sher.json => test_3d_particle_pusher.json} | 0 ..._3d.json => test_3d_particles_in_pml.json} | 0 ....json => test_3d_particles_in_pml_mr.json} | 0 ...{pec_field.json => test_3d_pec_field.json} | 0 ...ield_mr.json => test_3d_pec_field_mr.json} | 0 ...article.json => test_3d_pec_particle.json} | 0 ...pusher.json => test_3d_photon_pusher.json} | 0 ... test_3d_plasma_acceleration_boosted.json} | 0 ...d_plasma_acceleration_boosted_hybrid.json} | 0 ...test_3d_plasma_acceleration_mr_picmi.json} | 0 ...=> test_3d_plasma_acceleration_picmi.json} | 0 ...sma_lens.json => test_3d_plasma_lens.json} | 0 ....json => test_3d_plasma_lens_boosted.json} | 0 ...on => test_3d_plasma_lens_hard_edged.json} | 0 ...rt.json => test_3d_plasma_lens_short.json} | 0 ...test_3d_pml_psatd_dive_divb_cleaning.json} | 0 ....json => test_3d_point_of_contact_eb.json} | 0 ....json => test_3d_proton_boron_fusion.json} | 0 ...3d.json => test_3d_qed_breit_wheeler.json} | 0 ..._3d.json => test_3d_qed_quantum_sync.json} | 0 ...er_1.json => test_3d_qed_schwinger_1.json} | 0 ...er_2.json => test_3d_qed_schwinger_2.json} | 0 ...er_3.json => test_3d_qed_schwinger_3.json} | 0 ...er_4.json => test_3d_qed_schwinger_4.json} | 0 ...n.json => test_3d_radiation_reaction.json} | 0 ..._diags.json => test_3d_reduced_diags.json} | 0 ...d_diags_load_balance_costs_heuristic.json} | 0 ...uced_diags_load_balance_costs_timers.json} | 0 ...iags_load_balance_costs_timers_psatd.json} | 0 ...st_3d_reduced_diags_single_precision.json} | 0 ...tivistic_space_charge_initialization.json} | 0 ..._eb.json => test_3d_restart_eb_picmi.json} | 0 ... test_3d_space_charge_initialization.json} | 0 ...ma_3d.json => test_3d_uniform_plasma.json} | 0 ...son => test_3d_uniform_plasma_multiJ.json} | 0 ...on_3d.json => test_3d_vay_deposition.json} | 0 .../{btd_rz.json => test_rz_btd.json} | 0 ...llision_rz.json => test_rz_collision.json} | 0 ... => test_rz_deuterium_tritium_fusion.json} | 0 ...json => test_rz_electrostatic_sphere.json} | 0 ...n => test_rz_electrostatic_sphere_eb.json} | 0 ...> test_rz_electrostatic_sphere_eb_mr.json} | 0 ...est_rz_embedded_boundary_diffraction.json} | 0 ...on_rz.json => test_rz_flux_injection.json} | 0 ...psatd.json => test_rz_galilean_psatd.json} | 0 ...rz_galilean_psatd_current_correction.json} | 0 ...alilean_psatd_current_correction_psb.json} | 0 ...id_rz.json => test_rz_langmuir_fluid.json} | 0 ...ti_rz.json => test_rz_langmuir_multi.json} | 0 ...json => test_rz_langmuir_multi_picmi.json} | 0 ...json => test_rz_langmuir_multi_psatd.json} | 0 ...gmuir_multi_psatd_current_correction.json} | 0 ... test_rz_langmuir_multi_psatd_multiJ.json} | 0 ...z.json => test_rz_laser_acceleration.json} | 0 ... => test_rz_laser_acceleration_picmi.json} | 0 ...rz_laser_injection_from_RZ_lasy_file.json} | 0 ...st_rz_laser_injection_from_lasy_file.json} | 0 ... => test_rz_load_external_field_grid.json} | 0 ...est_rz_load_external_field_particles.json} | 0 ...on => test_rz_magnetostatic_eb_picmi.json} | 0 ...z_psatd.json => test_rz_multiJ_psatd.json} | 0 ...=> test_rz_ohm_solver_em_modes_picmi.json} | 0 ..._particle_boundary_interaction_picmi.json} | 0 ...l_psatd_rz.json => test_rz_pml_psatd.json} | 0 ....json => test_rz_point_of_contact_eb.json} | 0 .../{scraping.json => test_rz_scraping.json} | 0 ...z_z.json => test_rz_silver_mueller_z.json} | 0 ....json => test_rz_spacecraft_charging.json} | 0 625 files changed, 724 insertions(+), 1209 deletions(-) rename Examples/Physics_applications/{beam-beam_collision => beam_beam_collision}/CMakeLists.txt (52%) rename Examples/Physics_applications/{beam-beam_collision => beam_beam_collision}/README.rst (100%) rename Examples/Physics_applications/{beam-beam_collision/inputs_3d_test_beam_beam_collision => beam_beam_collision/inputs_test_3d_beam_beam_collision} (100%) delete mode 100644 Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc rename Examples/Physics_applications/capacitive_discharge/{inputs_1d_base_picmi.py => inputs_base_1d_picmi.py} (100%) rename Examples/Physics_applications/capacitive_discharge/{inputs_2d_base => inputs_test_2d_background_mcc} (98%) rename Examples/Physics_applications/capacitive_discharge/{inputs_2d_test_background_mcc_picmi.py => inputs_test_2d_background_mcc_picmi.py} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_rz_base => inputs_base_rz} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_test_laser_acceleration_1d => inputs_test_1d_laser_acceleration} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_test_laser_acceleration_1d_fluid => inputs_test_1d_laser_acceleration_fluid} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_test_laser_acceleration_1d_fluid_boosted => inputs_test_1d_laser_acceleration_fluid_boosted} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_1d_test_laser_acceleration_1d_picmi.py => inputs_test_1d_laser_acceleration_picmi.py} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d_test_laser_acceleration_2d_boosted => inputs_test_2d_laser_acceleration_boosted} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_3d_test_laser_acceleration_3d => inputs_test_2d_laser_acceleration_mr} (52%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d_test_laser_acceleration_2d_mr_picmi.py => inputs_test_2d_laser_acceleration_mr_picmi.py} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_2d_test_refined_injection => inputs_test_2d_refined_injection} (81%) rename Examples/Physics_applications/{plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr => laser_acceleration/inputs_test_3d_laser_acceleration} (52%) rename Examples/Physics_applications/laser_acceleration/{inputs_3d_test_laser_acceleration_3d_picmi.py => inputs_test_3d_laser_acceleration_picmi.py} (100%) rename Examples/Physics_applications/laser_acceleration/{inputs_3d_test_laser_acceleration_3d_single_precision_comms => inputs_test_3d_laser_acceleration_single_precision_comms} (79%) rename Examples/Physics_applications/laser_acceleration/{inputs_rz_test_laser_acceleration_rz => inputs_test_rz_laser_acceleration} (83%) rename Examples/Physics_applications/laser_acceleration/{inputs_rz_test_laser_acceleration_rz_opmd => inputs_test_rz_laser_acceleration_opmd} (91%) rename Examples/Physics_applications/laser_acceleration/{inputs_rz_test_laser_acceleration_rz_picmi.py => inputs_test_rz_laser_acceleration_picmi.py} (100%) rename Examples/Physics_applications/laser_ion/{inputs_2d_test_laser_ion_acc_2d => inputs_test_2d_laser_ion_acc} (100%) rename Examples/Physics_applications/laser_ion/{inputs_2d_test_laser_ion_acc_2d_picmi.py => inputs_test_2d_laser_ion_acc_picmi.py} (100%) rename Examples/Physics_applications/plasma_acceleration/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Physics_applications/plasma_acceleration/{inputs_1d_test_plasma_acceleration_1d_picmi.py => inputs_test_1d_plasma_acceleration_picmi.py} (100%) rename Examples/Physics_applications/plasma_acceleration/{inputs_2d_test_plasma_acceleration_boosted_2d => inputs_test_2d_plasma_acceleration_boosted} (100%) rename Examples/Physics_applications/{uniform_plasma/inputs_3d_test_uniform_plasma_3d => plasma_acceleration/inputs_test_2d_plasma_acceleration_mr} (52%) rename Examples/Physics_applications/plasma_acceleration/{inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving => inputs_test_2d_plasma_acceleration_mr_momentum_conserving} (80%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_test_plasma_acceleration_boosted_3d => inputs_test_3d_plasma_acceleration_boosted} (73%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_test_plasma_acceleration_boosted_3d_hybrid => inputs_test_3d_plasma_acceleration_boosted_hybrid} (84%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_test_plasma_acceleration_3d_mr_picmi.py => inputs_test_3d_plasma_acceleration_mr_picmi.py} (100%) rename Examples/Physics_applications/plasma_acceleration/{inputs_3d_test_plasma_acceleration_3d_picmi.py => inputs_test_3d_plasma_acceleration_picmi.py} (100%) rename Examples/Physics_applications/plasma_mirror/{inputs_2d_test_plasma_mirror => inputs_test_2d_plasma_mirror} (100%) rename Examples/Physics_applications/spacecraft_charging/{inputs_rz_test_spacecraft_charging_picmi.py => inputs_test_rz_spacecraft_charging_picmi.py} (100%) delete mode 100644 Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart rename Examples/Physics_applications/uniform_plasma/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Physics_applications/uniform_plasma/{inputs_2d_test_uniform_plasma_2d => inputs_test_2d_uniform_plasma} (100%) rename Examples/Physics_applications/{laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr => uniform_plasma/inputs_test_3d_uniform_plasma} (52%) create mode 100644 Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart rename Examples/Tests/accelerator_lattice/{inputs_3d_test_hard_edged_quadrupoles => inputs_test_3d_hard_edged_quadrupoles} (100%) rename Examples/Tests/accelerator_lattice/{inputs_3d_test_hard_edged_quadrupoles_boosted => inputs_test_3d_hard_edged_quadrupoles_boosted} (100%) rename Examples/Tests/accelerator_lattice/{inputs_3d_test_hard_edged_quadrupoles_moving => inputs_test_3d_hard_edged_quadrupoles_moving} (100%) rename Examples/Tests/boosted_diags/{inputs_3d_test_laser_acceleration_btd => inputs_test_3d_laser_acceleration_btd} (100%) rename Examples/Tests/boundaries/{inputs_3d_test_particle_boundaries_3d => inputs_test_3d_particle_boundaries} (100%) rename Examples/Tests/btd_rz/{analysis_btd_laser_antenna.py => analysis.py} (100%) rename Examples/Tests/btd_rz/{inputs_rz_test_btd_rz => inputs_test_rz_btd} (100%) rename Examples/Tests/collider_relevant_diags/{analysis_multiple_particles.py => analysis.py} (99%) rename Examples/Tests/collider_relevant_diags/{inputs_3d_test_collider_diagnostics => inputs_test_3d_collider_diagnostics} (100%) rename Examples/Tests/collision/{inputs_1d_test_collision_z => inputs_test_1d_collision_z} (100%) rename Examples/Tests/collision/{inputs_2d_test_collision_xz => inputs_test_2d_collision_xz} (100%) rename Examples/Tests/collision/{inputs_2d_test_collision_xz_picmi.py => inputs_test_2d_collision_xz_picmi.py} (100%) rename Examples/Tests/collision/{inputs_3d_test_collision_iso => inputs_test_3d_collision_iso} (100%) rename Examples/Tests/collision/{inputs_3d_test_collision_xyz => inputs_test_3d_collision_xyz} (100%) rename Examples/Tests/collision/{inputs_rz_test_collision_rz => inputs_test_rz_collision} (100%) rename Examples/Tests/divb_cleaning/{inputs_3d_test_divb_cleaning_3d => inputs_test_3d_divb_cleaning} (100%) rename Examples/Tests/dive_cleaning/{inputs_2d_test_dive_cleaning_2d => inputs_test_2d_dive_cleaning} (100%) rename Examples/Tests/dive_cleaning/{inputs_3d_test_dive_cleaning_3d => inputs_test_3d_dive_cleaning} (100%) rename Examples/Tests/electrostatic_dirichlet_bc/{inputs_2d_test_dirichlet_bc => inputs_test_2d_dirichlet_bc} (100%) rename Examples/Tests/electrostatic_dirichlet_bc/{inputs_2d_test_dirichlet_bc_picmi.py => inputs_test_2d_dirichlet_bc_picmi.py} (100%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_test_electrostatic_sphere => inputs_test_3d_electrostatic_sphere} (80%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_test_electrostatic_sphere_lab_frame => inputs_test_3d_electrostatic_sphere_lab_frame} (85%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 => inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10} (93%) rename Examples/Tests/electrostatic_sphere/{inputs_3d_test_electrostatic_sphere_rel_nodal => inputs_test_3d_electrostatic_sphere_rel_nodal} (84%) rename Examples/Tests/electrostatic_sphere/{inputs_rz_test_electrostatic_sphere_rz => inputs_test_rz_electrostatic_sphere} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_3d_test_electrostatic_sphere_eb => inputs_test_3d_electrostatic_sphere_eb} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_3d_test_electrostatic_sphere_eb_mixed_bc => inputs_test_3d_electrostatic_sphere_eb_mixed_bc} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_3d_test_electrostatic_sphere_eb_picmi.py => inputs_test_3d_electrostatic_sphere_eb_picmi.py} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_rz_test_electrostatic_sphere_eb_rz => inputs_test_rz_electrostatic_sphere_eb} (100%) rename Examples/Tests/electrostatic_sphere_eb/{inputs_rz_test_electrostatic_sphere_eb_rz_mr => inputs_test_rz_electrostatic_sphere_eb_mr} (100%) rename Examples/Tests/embedded_boundary_cube/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/embedded_boundary_cube/{inputs_2d_test_embedded_boundary_cube_2d => inputs_test_2d_embedded_boundary_cube} (100%) rename Examples/Tests/embedded_boundary_cube/{inputs_3d_test_embedded_boundary_cube_3d => inputs_test_3d_embedded_boundary_cube} (53%) rename Examples/Tests/embedded_boundary_cube/{inputs_3d_test_embedded_boundary_cube_3d_macroscopic => inputs_test_3d_embedded_boundary_cube_macroscopic} (89%) rename Examples/Tests/embedded_boundary_diffraction/{inputs_rz_test_embedded_boundary_diffraction => inputs_test_rz_embedded_boundary_diffraction} (100%) rename Examples/Tests/embedded_boundary_python_api/{inputs_3d_test_embedded_boundary_picmi.py => inputs_test_3d_embedded_boundary_picmi.py} (100%) rename Examples/Tests/embedded_boundary_rotated_cube/{inputs_2d_test_embedded_boundary_rotated_cube_2d => inputs_test_2d_embedded_boundary_rotated_cube} (100%) rename Examples/Tests/embedded_boundary_rotated_cube/{inputs_3d_test_embedded_boundary_rotated_cube_3d => inputs_test_3d_embedded_boundary_rotated_cube} (100%) rename Examples/Tests/embedded_circle/{inputs_2d_test_embedded_circle => inputs_test_2d_embedded_circle} (100%) rename Examples/Tests/energy_conserving_thermal_plasma/{inputs_2d_test_energy_conserving_thermal_plasma => inputs_test_2d_energy_conserving_thermal_plasma} (100%) rename Examples/Tests/field_probe/{analysis_field_probe.py => analysis.py} (100%) rename Examples/Tests/field_probe/{inputs_2d_test_field_probe => inputs_test_2d_field_probe} (100%) rename Examples/Tests/flux_injection/{inputs_3d_test_flux_injection_3d => inputs_test_3d_flux_injection} (100%) rename Examples/Tests/flux_injection/{inputs_rz_test_flux_injection_rz => inputs_test_rz_flux_injection} (100%) rename Examples/Tests/gaussian_beam/{analysis_focusing_beam.py => analysis.py} (100%) rename Examples/Tests/gaussian_beam/{inputs_3d_test_focusing_gaussian_beam => inputs_test_3d_focusing_gaussian_beam} (100%) rename Examples/Tests/gaussian_beam/{inputs_3d_test_gaussian_beam_picmi.py => inputs_test_3d_gaussian_beam_picmi.py} (100%) rename Examples/Tests/implicit/{inputs_1d_test_semi_implicit_picard_1d => inputs_test_1d_semi_implicit_picard} (100%) rename Examples/Tests/implicit/{inputs_1d_test_theta_implicit_picard_1d => inputs_test_1d_theta_implicit_picard} (100%) rename Examples/Tests/implicit/{inputs_2d_test_theta_implicit_jfnk_vandb_2d => inputs_test_2d_theta_implicit_jfnk_vandb} (100%) rename Examples/Tests/implicit/{inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py => inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py} (100%) rename Examples/Tests/initial_distribution/{analysis_distribution.py => analysis.py} (100%) rename Examples/Tests/initial_distribution/{inputs_3d_test_initial_distribution => inputs_test_3d_initial_distribution} (100%) rename Examples/Tests/ion_stopping/{analysis_ion_stopping.py => analysis.py} (100%) rename Examples/Tests/ion_stopping/{inputs_3d_test_ion_stopping => inputs_test_3d_ion_stopping} (100%) rename Examples/Tests/ionization/{analysis_ionization.py => analysis.py} (100%) rename Examples/Tests/ionization/{inputs_2d_test_ionization_boost => inputs_test_2d_ionization_boost} (100%) rename Examples/Tests/ionization/{inputs_2d_test_ionization_lab => inputs_test_2d_ionization_lab} (100%) rename Examples/Tests/ionization/{inputs_2d_test_ionization_picmi.py => inputs_test_2d_ionization_picmi.py} (100%) delete mode 100644 Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d rename Examples/Tests/langmuir/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Tests/langmuir/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/langmuir/{inputs_rz_base => inputs_base_rz} (100%) rename Examples/Tests/langmuir/{inputs_1d_test_langmuir_multi_1d => inputs_test_1d_langmuir_multi} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_mr => inputs_test_2d_langmuir_multi_mr} (92%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_mr_anisotropic => inputs_test_2d_langmuir_multi_mr_anisotropic} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving => inputs_test_2d_langmuir_multi_mr_momentum_conserving} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_mr_psatd => inputs_test_2d_langmuir_multi_mr_psatd} (94%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_nodal => inputs_test_2d_langmuir_multi_nodal} (89%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_picmi.py => inputs_test_2d_langmuir_multi_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd => inputs_test_2d_langmuir_multi_psatd} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_current_correction => inputs_test_2d_langmuir_multi_psatd_current_correction} (94%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal => inputs_test_2d_langmuir_multi_psatd_current_correction_nodal} (94%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving => inputs_test_2d_langmuir_multi_psatd_momentum_conserving} (94%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_multiJ => inputs_test_2d_langmuir_multi_psatd_multiJ} (92%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal => inputs_test_2d_langmuir_multi_psatd_multiJ_nodal} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_nodal => inputs_test_2d_langmuir_multi_psatd_nodal} (94%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition => inputs_test_2d_langmuir_multi_psatd_vay_deposition} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal => inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal} (93%) rename Examples/Tests/langmuir/{inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 => inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4} (93%) create mode 100644 Examples/Tests/langmuir/inputs_test_3d_langmuir_multi rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_nodal => inputs_test_3d_langmuir_multi_nodal} (83%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_picmi.py => inputs_test_3d_langmuir_multi_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd => inputs_test_3d_langmuir_multi_psatd} (83%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_current_correction => inputs_test_3d_langmuir_multi_psatd_current_correction} (92%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal => inputs_test_3d_langmuir_multi_psatd_current_correction_nodal} (93%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning => inputs_test_3d_langmuir_multi_psatd_div_cleaning} (94%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving => inputs_test_3d_langmuir_multi_psatd_momentum_conserving} (87%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_multiJ => inputs_test_3d_langmuir_multi_psatd_multiJ} (93%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal => inputs_test_3d_langmuir_multi_psatd_multiJ_nodal} (94%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_nodal => inputs_test_3d_langmuir_multi_psatd_nodal} (91%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition => inputs_test_3d_langmuir_multi_psatd_vay_deposition} (90%) rename Examples/Tests/langmuir/{inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal => inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal} (91%) rename Examples/Tests/langmuir/{inputs_rz_test_langmuir_multi_rz => inputs_test_rz_langmuir_multi} (87%) rename Examples/Tests/langmuir/{inputs_rz_test_langmuir_multi_rz_picmi.py => inputs_test_rz_langmuir_multi_picmi.py} (100%) rename Examples/Tests/langmuir/{inputs_rz_test_langmuir_multi_rz_psatd => inputs_test_rz_langmuir_multi_psatd} (94%) rename Examples/Tests/langmuir/{inputs_rz_test_langmuir_multi_rz_psatd_current_correction => inputs_test_rz_langmuir_multi_psatd_current_correction} (95%) rename Examples/Tests/langmuir/{inputs_rz_test_langmuir_multi_rz_psatd_multiJ => inputs_test_rz_langmuir_multi_psatd_multiJ} (96%) rename Examples/Tests/langmuir_fluids/{inputs_1d_test_langmuir_fluid_1d => inputs_test_1d_langmuir_fluid} (100%) rename Examples/Tests/langmuir_fluids/{inputs_2d_test_langmuir_fluid_2d => inputs_test_2d_langmuir_fluid} (100%) rename Examples/Tests/langmuir_fluids/{inputs_3d_test_langmuir_fluid_3d => inputs_test_3d_langmuir_fluid} (100%) rename Examples/Tests/langmuir_fluids/{inputs_rz_test_langmuir_fluid_rz => inputs_test_rz_langmuir_fluid} (100%) rename Examples/Tests/larmor/{inputs_2d_test_larmor => inputs_test_2d_larmor} (100%) rename Examples/Tests/laser_injection/{inputs_1d_test_laser_injection_1d => inputs_test_1d_laser_injection} (100%) rename Examples/Tests/laser_injection/{inputs_2d_test_laser_injection_2d => inputs_test_2d_laser_injection} (100%) rename Examples/Tests/laser_injection/{inputs_3d_test_laser_injection_3d => inputs_test_3d_laser_injection} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_1d_test_laser_injection_from_lasy_file_1d => inputs_test_1d_laser_injection_from_lasy_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_1d_test_laser_injection_from_lasy_file_1d_boost => inputs_test_1d_laser_injection_from_lasy_file_boost} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_2d_test_laser_injection_from_binary_file => inputs_test_2d_laser_injection_from_binary_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_2d_test_laser_injection_from_lasy_file_2d => inputs_test_2d_laser_injection_from_lasy_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_3d_test_laser_injection_from_lasy_file_3d => inputs_test_3d_laser_injection_from_lasy_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_rz_test_laser_injection_from_rz_lasy_file => inputs_test_rz_laser_injection_from_RZ_lasy_file} (100%) rename Examples/Tests/laser_injection_from_file/{inputs_rz_test_laser_injection_from_lasy_file_rz => inputs_test_rz_laser_injection_from_lasy_file} (100%) rename Examples/Tests/laser_on_fine/{inputs_2d_test_laser_on_fine => inputs_test_2d_laser_on_fine} (100%) delete mode 100644 Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart delete mode 100644 Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart rename Examples/Tests/load_external_field/{inputs_3d_test_load_external_field_3d_grid_picmi.py => inputs_test_3d_load_external_field_grid_picmi.py} (100%) rename Examples/Tests/load_external_field/{inputs_3d_test_load_external_field_3d_particle_picmi.py => inputs_test_3d_load_external_field_particle_picmi.py} (100%) rename Examples/Tests/load_external_field/{inputs_rz_test_load_external_field_rz_grid => inputs_test_rz_load_external_field_grid} (100%) create mode 100644 Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart rename Examples/Tests/load_external_field/{inputs_rz_test_load_external_field_rz_particles => inputs_test_rz_load_external_field_particles} (100%) create mode 100644 Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart rename Examples/Tests/magnetostatic_eb/{inputs_3d_test_magnetostatic_eb_3d => inputs_test_3d_magnetostatic_eb} (100%) rename Examples/Tests/magnetostatic_eb/{inputs_3d_test_magnetostatic_eb_3d_picmi.py => inputs_test_3d_magnetostatic_eb_picmi.py} (100%) rename Examples/Tests/magnetostatic_eb/{inputs_rz_test_magnetostatic_eb_rz_picmi.py => inputs_test_rz_magnetostatic_eb_picmi.py} (100%) rename Examples/Tests/maxwell_hybrid_qed/{inputs_2d_test_maxwell_hybrid_qed_solver => inputs_test_2d_maxwell_hybrid_qed_solver} (100%) rename Examples/Tests/nci_fdtd_stability/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Tests/nci_fdtd_stability/{inputs_2d_test_nci_corrector => inputs_test_2d_nci_corrector} (81%) rename Examples/Tests/nci_fdtd_stability/{inputs_2d_test_nci_corrector_mr => inputs_test_2d_nci_corrector_mr} (89%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_2d_base => inputs_base_2d_averaged} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_3d_base => inputs_base_3d_averaged} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_rz_base => inputs_base_rz} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_3d_test_averaged_galilean_3d_psatd => inputs_test_2d_averaged_galilean_psatd} (79%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid => inputs_test_2d_averaged_galilean_psatd_hybrid} (86%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_test_comoving_2d_psatd_hybrid => inputs_test_2d_comoving_psatd_hybrid} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_test_galilean_2d_psatd => inputs_test_2d_galilean_psatd} (89%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_test_galilean_2d_psatd_current_correction => inputs_test_2d_galilean_psatd_current_correction} (91%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_test_galilean_2d_psatd_current_correction_psb => inputs_test_2d_galilean_psatd_current_correction_psb} (89%) rename Examples/Tests/nci_psatd_stability/{inputs_2d_test_galilean_2d_psatd_hybrid => inputs_test_2d_galilean_psatd_hybrid} (100%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_2d_test_averaged_galilean_2d_psatd => inputs_test_3d_averaged_galilean_psatd} (79%) rename Examples/Tests/nci_psatd_stability/{inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid => inputs_test_3d_averaged_galilean_psatd_hybrid} (82%) rename Examples/Tests/nci_psatd_stability/{inputs_3d_test_galilean_3d_psatd => inputs_test_3d_galilean_psatd} (88%) rename Examples/Tests/nci_psatd_stability/{inputs_3d_test_galilean_3d_psatd_current_correction => inputs_test_3d_galilean_psatd_current_correction} (92%) rename Examples/Tests/nci_psatd_stability/{inputs_3d_test_galilean_3d_psatd_current_correction_psb => inputs_test_3d_galilean_psatd_current_correction_psb} (92%) rename Examples/Tests/nci_psatd_stability/{inputs_3d_test_uniform_plasma_multiJ => inputs_test_3d_uniform_plasma_multiJ} (94%) rename Examples/Tests/nci_psatd_stability/{inputs_rz_test_galilean_rz_psatd => inputs_test_rz_galilean_psatd} (88%) rename Examples/Tests/nci_psatd_stability/{inputs_rz_test_galilean_rz_psatd_current_correction => inputs_test_rz_galilean_psatd_current_correction} (90%) rename Examples/Tests/nci_psatd_stability/{inputs_rz_test_galilean_rz_psatd_current_correction_psb => inputs_test_rz_galilean_psatd_current_correction_psb} (87%) rename Examples/Tests/nci_psatd_stability/{inputs_rz_test_multi_J_rz_psatd => inputs_test_rz_multiJ_psatd} (100%) rename Examples/Tests/nodal_electrostatic/{analysis_3d.py => analysis.py} (100%) rename Examples/Tests/nodal_electrostatic/{inputs_3d_test_nodal_electrostatic_solver => inputs_test_3d_nodal_electrostatic_solver} (100%) rename Examples/Tests/nuclear_fusion/{inputs_2d_test_proton_boron_fusion_2d => inputs_test_2d_proton_boron_fusion} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_deuterium_deuterium_fusion_3d => inputs_test_3d_deuterium_deuterium_fusion} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies => inputs_test_3d_deuterium_deuterium_fusion_intraspecies} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_deuterium_tritium_fusion_3d => inputs_test_3d_deuterium_tritium_fusion} (100%) rename Examples/Tests/nuclear_fusion/{inputs_3d_test_proton_boron_fusion_3d => inputs_test_3d_proton_boron_fusion} (100%) rename Examples/Tests/nuclear_fusion/{inputs_rz_test_deuterium_tritium_fusion_rz => inputs_test_rz_deuterium_tritium_fusion} (100%) rename Examples/Tests/ohm_solver_em_modes/{inputs_1d_test_ohm_solver_em_modes_1d_picmi.py => inputs_test_1d_ohm_solver_em_modes_picmi.py} (100%) rename Examples/Tests/ohm_solver_em_modes/{inputs_rz_test_ohm_solver_em_modes_rz_picmi.py => inputs_test_rz_ohm_solver_em_modes_picmi.py} (100%) rename Examples/Tests/open_bc_poisson_solver/{inputs_3d_test_open_bc_poisson_solver => inputs_test_3d_open_bc_poisson_solver} (100%) rename Examples/Tests/particle_boundary_interaction/{inputs_rz_test_particle_boundary_interaction_picmi.py => inputs_test_rz_particle_boundary_interaction_picmi.py} (100%) rename Examples/Tests/particle_boundary_process/{inputs_2d_test_particle_reflection_picmi.py => inputs_test_2d_particle_reflection_picmi.py} (100%) rename Examples/Tests/particle_boundary_process/{inputs_3d_test_particle_absorption => inputs_test_3d_particle_absorption} (100%) rename Examples/Tests/particle_boundary_scrape/{inputs_3d_test_particle_scrape => inputs_test_3d_particle_scrape} (100%) rename Examples/Tests/particle_boundary_scrape/{inputs_3d_test_particle_scrape_picmi.py => inputs_test_3d_particle_scrape_picmi.py} (100%) rename Examples/Tests/particle_data_python/{inputs_2d_test_particle_attr_access_picmi.py => inputs_test_2d_particle_attr_access_picmi.py} (100%) rename Examples/Tests/particle_data_python/{inputs_2d_test_prev_positions_picmi.py => inputs_test_2d_prev_positions_picmi.py} (100%) rename Examples/Tests/particle_fields_diags/{inputs_3d_test_particle_fields_diags => inputs_test_3d_particle_fields_diags} (100%) rename Examples/Tests/particle_pusher/{analysis_pusher.py => analysis.py} (100%) rename Examples/Tests/particle_pusher/{inputs_3d_test_particle_pusher => inputs_test_3d_particle_pusher} (100%) rename Examples/Tests/particle_thermal_boundary/{analysis_2d.py => analysis.py} (100%) rename Examples/Tests/particle_thermal_boundary/{inputs_2d_test_particle_thermal_boundary => inputs_test_2d_particle_thermal_boundary} (100%) rename Examples/Tests/particles_in_pml/{inputs_2d_test_particles_in_pml_2d => inputs_test_2d_particles_in_pml} (100%) rename Examples/Tests/particles_in_pml/{inputs_2d_test_particles_in_pml_2d_mr => inputs_test_2d_particles_in_pml_mr} (100%) rename Examples/Tests/particles_in_pml/{inputs_3d_test_particles_in_pml_3d => inputs_test_3d_particles_in_pml} (100%) rename Examples/Tests/particles_in_pml/{inputs_3d_test_particles_in_pml_3d_mr => inputs_test_3d_particles_in_pml_mr} (100%) rename Examples/Tests/pass_mpi_communicator/{inputs_2d_test_pass_mpi_comm_picmi.py => inputs_test_2d_pass_mpi_comm_picmi.py} (100%) rename Examples/Tests/pec/{inputs_3d_test_pec_field => inputs_test_3d_pec_field} (100%) rename Examples/Tests/pec/{inputs_3d_test_pec_field_mr => inputs_test_3d_pec_field_mr} (100%) rename Examples/Tests/pec/{inputs_3d_test_pec_particle => inputs_test_3d_pec_particle} (100%) rename Examples/Tests/photon_pusher/{analysis_photon_pusher.py => analysis.py} (100%) rename Examples/Tests/photon_pusher/{inputs_3d_test_photon_pusher => inputs_test_3d_photon_pusher} (100%) rename Examples/Tests/plasma_lens/{inputs_3d_test_plasma_lens => inputs_test_3d_plasma_lens} (100%) rename Examples/Tests/plasma_lens/{inputs_3d_test_plasma_lens_boosted => inputs_test_3d_plasma_lens_boosted} (100%) rename Examples/Tests/plasma_lens/{inputs_3d_test_plasma_lens_hard_edged => inputs_test_3d_plasma_lens_hard_edged} (100%) rename Examples/Tests/plasma_lens/{inputs_3d_test_plasma_lens_picmi.py => inputs_test_3d_plasma_lens_picmi.py} (100%) rename Examples/Tests/plasma_lens/{inputs_3d_test_plasma_lens_short => inputs_test_3d_plasma_lens_short} (100%) delete mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart delete mode 100644 Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart rename Examples/Tests/pml/{inputs_2d_base => inputs_base_2d} (100%) rename Examples/Tests/pml/{inputs_2d_test_pml_x_ckc => inputs_test_2d_pml_x_ckc} (77%) rename Examples/Tests/pml/{inputs_2d_test_pml_x_galilean => inputs_test_2d_pml_x_galilean} (94%) rename Examples/Tests/pml/{inputs_2d_test_pml_x_psatd => inputs_test_2d_pml_x_psatd} (93%) create mode 100644 Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart rename Examples/Tests/pml/{inputs_2d_test_pml_x_yee => inputs_test_2d_pml_x_yee} (77%) create mode 100644 Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart rename Examples/Tests/pml/{inputs_3d_test_pml_psatd_dive_divb_cleaning => inputs_test_3d_pml_psatd_dive_divb_cleaning} (100%) rename Examples/Tests/pml/{inputs_rz_test_pml_psatd_rz => inputs_test_rz_pml_psatd} (100%) rename Examples/Tests/point_of_contact_eb/{inputs_3d_test_point_of_contact_eb_3d => inputs_test_3d_point_of_contact_eb} (100%) rename Examples/Tests/point_of_contact_eb/{inputs_rz_test_point_of_contact_eb_rz => inputs_test_rz_point_of_contact_eb} (100%) rename Examples/Tests/python_wrappers/{inputs_2d_test_python_wrappers_picmi.py => inputs_test_2d_python_wrappers_picmi.py} (100%) delete mode 100644 Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d delete mode 100644 Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d rename Examples/Tests/qed/{inputs_2d_base_breit_wheeler => inputs_base_2d_breit_wheeler} (100%) rename Examples/Tests/qed/{inputs_3d_base_breit_wheeler => inputs_base_3d_breit_wheeler} (100%) rename Examples/Tests/qed/{inputs_3d_base_schwinger => inputs_base_3d_schwinger} (100%) create mode 100644 Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler rename Examples/Tests/qed/{inputs_2d_test_qed_breit_wheeler_2d_opmd => inputs_test_2d_qed_breit_wheeler_opmd} (73%) rename Examples/Tests/qed/{inputs_2d_test_qed_quantum_sync_2d => inputs_test_2d_qed_quantum_sync} (100%) create mode 100644 Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler rename Examples/Tests/qed/{inputs_3d_test_qed_breit_wheeler_3d_opmd => inputs_test_3d_qed_breit_wheeler_opmd} (73%) rename Examples/Tests/qed/{inputs_3d_test_qed_quantum_sync_3d => inputs_test_3d_qed_quantum_sync} (100%) rename Examples/Tests/qed/{inputs_3d_test_qed_schwinger_1 => inputs_test_3d_qed_schwinger_1} (83%) rename Examples/Tests/qed/{inputs_3d_test_qed_schwinger_2 => inputs_test_3d_qed_schwinger_2} (87%) rename Examples/Tests/qed/{inputs_3d_test_qed_schwinger_3 => inputs_test_3d_qed_schwinger_3} (75%) rename Examples/Tests/qed/{inputs_3d_test_qed_schwinger_4 => inputs_test_3d_qed_schwinger_4} (85%) rename Examples/Tests/radiation_reaction/{inputs_3d_test_radiation_reaction => inputs_test_3d_radiation_reaction} (100%) rename Examples/Tests/reduced_diags/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/reduced_diags/{inputs_3d_test_reduced_diags => inputs_test_3d_reduced_diags} (100%) rename Examples/Tests/reduced_diags/{inputs_3d_test_reduced_diags_load_balance_costs_heuristic => inputs_test_3d_reduced_diags_load_balance_costs_heuristic} (80%) rename Examples/Tests/reduced_diags/{inputs_3d_test_reduced_diags_load_balance_costs_timers => inputs_test_3d_reduced_diags_load_balance_costs_timers} (80%) rename Examples/Tests/reduced_diags/{inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py => inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py} (100%) rename Examples/Tests/reduced_diags/{inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd => inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd} (80%) rename Examples/Tests/relativistic_space_charge_initialization/{inputs_3d_test_relativistic_space_charge_initialization => inputs_test_3d_relativistic_space_charge_initialization} (100%) rename Examples/Tests/repelling_particles/{inputs_2d_test_repelling_particles => inputs_test_2d_repelling_particles} (100%) rename Examples/Tests/resampling/{inputs_1d_test_resample_velocity_coincidence_thinning => inputs_test_1d_resample_velocity_coincidence_thinning} (100%) rename Examples/Tests/resampling/{inputs_1d_test_resample_velocity_coincidence_thinning_cartesian => inputs_test_1d_resample_velocity_coincidence_thinning_cartesian} (100%) rename Examples/Tests/resampling/{inputs_2d_test_leveling_thinning => inputs_test_2d_leveling_thinning} (100%) delete mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration delete mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart delete mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart delete mode 100644 Examples/Tests/restart/inputs_3d_test_acceleration_restart rename Examples/Tests/restart/{inputs_3d_base => inputs_base_3d} (100%) rename Examples/Tests/restart/{inputs_2d_test_id_cpu_read_picmi.py => inputs_test_2d_id_cpu_read_picmi.py} (100%) rename Examples/Tests/restart/{inputs_2d_test_restart_runtime_components_picmi.py => inputs_test_2d_restart_runtime_components_picmi.py} (100%) create mode 100644 Examples/Tests/restart/inputs_test_3d_acceleration rename Examples/Tests/restart/{inputs_3d_test_acceleration_psatd => inputs_test_3d_acceleration_psatd} (93%) create mode 100644 Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart rename Examples/Tests/restart/{inputs_3d_test_acceleration_psatd_time_avg => inputs_test_3d_acceleration_psatd_time_avg} (93%) create mode 100644 Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart create mode 100644 Examples/Tests/restart/inputs_test_3d_acceleration_restart rename Examples/Tests/rigid_injection/{inputs_2d_test_rigid_injection_btd => inputs_test_2d_rigid_injection_btd} (100%) rename Examples/Tests/rigid_injection/{inputs_2d_test_rigid_injection_lab => inputs_test_2d_rigid_injection_lab} (100%) rename Examples/Tests/scraping/{inputs_rz_test_scraping => inputs_test_rz_scraping} (100%) rename Examples/Tests/scraping/{inputs_rz_test_scraping_filter => inputs_test_rz_scraping_filter} (100%) rename Examples/Tests/silver_mueller/{inputs_1d_test_silver_mueller_1d => inputs_test_1d_silver_mueller} (100%) rename Examples/Tests/silver_mueller/{inputs_2d_test_silver_mueller_2d_x => inputs_test_2d_silver_mueller_x} (100%) rename Examples/Tests/silver_mueller/{inputs_2d_test_silver_mueller_2d_z => inputs_test_2d_silver_mueller_z} (100%) rename Examples/Tests/silver_mueller/{inputs_rz_test_silver_mueller_rz_z => inputs_test_rz_silver_mueller_z} (100%) rename Examples/Tests/single_particle/{analysis_bilinear_filter.py => analysis.py} (100%) rename Examples/Tests/single_particle/{inputs_2d_test_bilinear_filter => inputs_test_2d_bilinear_filter} (100%) delete mode 100644 Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d delete mode 100644 Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d create mode 100644 Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization rename Examples/Tests/space_charge_initialization/{inputs_3d_base => inputs_test_3d_space_charge_initialization} (97%) rename Examples/Tests/subcycling/{inputs_2d_test_subcycling_mr => inputs_test_2d_subcycling_mr} (100%) rename Examples/Tests/vay_deposition/{inputs_2d_test_vay_deposition_2d => inputs_test_2d_vay_deposition} (100%) rename Examples/Tests/vay_deposition/{inputs_3d_test_vay_deposition_3d => inputs_test_3d_vay_deposition} (100%) rename Regression/Checksum/benchmarks_json/{collision_z.json => test_1d_collision_z.json} (100%) rename Regression/Checksum/benchmarks_json/{dsmc_1d_picmi.json => test_1d_dsmc_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_fluid_1d.json => test_1d_langmuir_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_1d.json => test_1d_langmuir_multi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_1d.json => test_1d_laser_acceleration.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_1d_fluid.json => test_1d_laser_acceleration_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_1d_fluid_boosted.json => test_1d_laser_acceleration_fluid_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_1d_picmi.json => test_1d_laser_acceleration_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_1d.json => test_1d_laser_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_lasy_file_1d.json => test_1d_laser_injection_from_lasy_file.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_lasy_file_1d_boost.json => test_1d_laser_injection_from_lasy_file_boost.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ohms_law_solver_ion_beam_1d.json => test_1d_ohm_law_solver_ion_beam_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{ohm_solver_em_modes_1d_picmi.json => test_1d_ohm_solver_em_modes_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_1d_picmi.json => test_1d_plasma_acceleration_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{resample_velocity_coincidence_thinning.json => test_1d_resample_velocity_coincidence_thinning.json} (100%) rename Regression/Checksum/benchmarks_json/{resample_velocity_coincidence_thinning_cartesian.json => test_1d_resample_velocity_coincidence_thinning_cartesian.json} (100%) rename Regression/Checksum/benchmarks_json/{semi_implicit_picard_1d.json => test_1d_semi_implicit_picard.json} (100%) rename Regression/Checksum/benchmarks_json/{silver_mueller_1d.json => test_1d_silver_mueller.json} (100%) rename Regression/Checksum/benchmarks_json/{theta_implicit_picard_1d.json => test_1d_theta_implicit_picard.json} (100%) rename Regression/Checksum/benchmarks_json/{averaged_galilean_2d_psatd.json => test_2d_averaged_galilean_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{averaged_galilean_2d_psatd_hybrid.json => test_2d_averaged_galilean_psatd_hybrid.json} (100%) rename Regression/Checksum/benchmarks_json/{background_mcc.json => test_2d_background_mcc.json} (100%) rename Regression/Checksum/benchmarks_json/{background_mcc_dp_psp.json => test_2d_background_mcc_dp_psp.json} (100%) rename Regression/Checksum/benchmarks_json/{bilinear_filter.json => test_2d_bilinear_filter.json} (100%) rename Regression/Checksum/benchmarks_json/{collision_xz.json => test_2d_collision_xz.json} (100%) rename Regression/Checksum/benchmarks_json/{comoving_2d_psatd_hybrid.json => test_2d_comoving_psatd_hybrid.json} (100%) rename Regression/Checksum/benchmarks_json/{dive_cleaning_2d.json => test_2d_dive_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_cube_2d.json => test_2d_embedded_boundary_cube.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_rotated_cube_2d.json => test_2d_embedded_boundary_rotated_cube.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_circle.json => test_2d_embedded_circle.json} (100%) rename Regression/Checksum/benchmarks_json/{energy_conserving_thermal_plasma.json => test_2d_energy_conserving_thermal_plasma.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_2d_psatd.json => test_2d_galilean_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_2d_psatd_current_correction.json => test_2d_galilean_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_2d_psatd_current_correction_psb.json => test_2d_galilean_psatd_current_correction_psb.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_2d_psatd_hybrid.json => test_2d_galilean_psatd_hybrid.json} (100%) rename Regression/Checksum/benchmarks_json/{id_cpu_read_picmi.json => test_2d_id_cpu_read_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{ionization_boost.json => test_2d_ionization_boost.json} (100%) rename Regression/Checksum/benchmarks_json/{ionization_lab.json => test_2d_ionization_lab.json} (100%) rename Regression/Checksum/benchmarks_json/{ionization_picmi.json => test_2d_ionization_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_fluid_2d.json => test_2d_langmuir_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_mr.json => test_2d_langmuir_multi_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_mr_anisotropic.json => test_2d_langmuir_multi_mr_anisotropic.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_mr_momentum_conserving.json => test_2d_langmuir_multi_mr_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_mr_psatd.json => test_2d_langmuir_multi_mr_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_nodal.json => test_2d_langmuir_multi_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_picmi.json => test_2d_langmuir_multi_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd.json => test_2d_langmuir_multi_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_current_correction.json => test_2d_langmuir_multi_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_current_correction_nodal.json => test_2d_langmuir_multi_psatd_current_correction_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_momentum_conserving.json => test_2d_langmuir_multi_psatd_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_multiJ.json => test_2d_langmuir_multi_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_multiJ_nodal.json => test_2d_langmuir_multi_psatd_multiJ_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_nodal.json => test_2d_langmuir_multi_psatd_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_vay_deposition.json => test_2d_langmuir_multi_psatd_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_vay_deposition_nodal.json => test_2d_langmuir_multi_psatd_vay_deposition_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json => test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4.json} (100%) rename Regression/Checksum/benchmarks_json/{larmor.json => test_2d_larmor.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_2d_boosted.json => test_2d_laser_acceleration_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_2d_mr.json => test_2d_laser_acceleration_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_2d_mr_picmi.json => test_2d_laser_acceleration_mr_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_2d.json => test_2d_laser_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_binary_file.json => test_2d_laser_injection_from_binary_file.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_lasy_file_2d.json => test_2d_laser_injection_from_lasy_file.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_ion_acc_2d.json => test_2d_laser_ion_acc.json} (100%) rename Regression/Checksum/benchmarks_json/{LaserIonAcc2d_no_field_diag.json => test_2d_laser_ion_acc_no_field_diag.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_ion_acc_2d_picmi.json => test_2d_laser_ion_acc_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_on_fine.json => test_2d_laser_on_fine.json} (100%) rename Regression/Checksum/benchmarks_json/{leveling_thinning.json => test_2d_leveling_thinning.json} (100%) rename Regression/Checksum/benchmarks_json/{maxwell_hybrid_qed_solver.json => test_2d_maxwell_hybrid_qed_solver.json} (100%) rename Regression/Checksum/benchmarks_json/{nci_corrector.json => test_2d_nci_corrector.json} (100%) rename Regression/Checksum/benchmarks_json/{nci_corrector_mr.json => test_2d_nci_corrector_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ohms_law_solver_landau_damping_2d.json => test_2d_ohm_law_solver_landau_damping_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_ohms_law_solver_magnetic_reconnection_2d.json => test_2d_ohm_law_solver_magnetic_reconnection_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{parabolic_channel_initialization_2d_single_precision.json => test_2d_parabolic_channel_initialization_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_thermal_boundary.json => test_2d_particle_thermal_boundary.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_2d.json => test_2d_particles_in_pml.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_2d_mr.json => test_2d_particles_in_pml_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_boosted_2d.json => test_2d_plasma_acceleration_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_2d_mr.json => test_2d_plasma_acceleration_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_2d_mr_momentum_conserving.json => test_2d_plasma_acceleration_mr_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_mirror.json => test_2d_plasma_mirror.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_x_ckc.json => test_2d_pml_x_ckc.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_x_galilean.json => test_2d_pml_x_galilean.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_x_psatd.json => test_2d_pml_x_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_x_yee.json => test_2d_pml_x_yee.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_x_yee_eb.json => test_2d_pml_x_yee_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{prev_positions_picmi.json => test_2d_prev_positions_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{proton_boron_fusion_2d.json => test_2d_proton_boron_fusion.json} (100%) rename Regression/Checksum/benchmarks_json/{python_wrappers_picmi.json => test_2d_python_wrappers_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_breit_wheeler_2d.json => test_2d_qed_breit_wheeler.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_quantum_sync_2d.json => test_2d_qed_quantum_sync.json} (100%) rename Regression/Checksum/benchmarks_json/{refined_injection.json => test_2d_refined_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{repelling_particles.json => test_2d_repelling_particles.json} (100%) rename Regression/Checksum/benchmarks_json/{rigid_injection_btd.json => test_2d_rigid_injection_btd.json} (100%) rename Regression/Checksum/benchmarks_json/{rigid_injection_lab.json => test_2d_rigid_injection_lab.json} (100%) rename Regression/Checksum/benchmarks_json/{silver_mueller_2d_x.json => test_2d_silver_mueller_x.json} (100%) rename Regression/Checksum/benchmarks_json/{silver_mueller_2d_z.json => test_2d_silver_mueller_z.json} (100%) rename Regression/Checksum/benchmarks_json/{space_charge_initialization_2d.json => test_2d_space_charge_initialization.json} (100%) rename Regression/Checksum/benchmarks_json/{subcycling_mr.json => test_2d_subcycling_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{theta_implicit_jfnk_vandb_2d.json => test_2d_theta_implicit_jfnk_vandb.json} (100%) rename Regression/Checksum/benchmarks_json/{theta_implicit_jfnk_vandb_2d_picmi.json => test_2d_theta_implicit_jfnk_vandb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{uniform_plasma_2d.json => test_2d_uniform_plasma.json} (100%) rename Regression/Checksum/benchmarks_json/{vay_deposition_2d.json => test_2d_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{acceleration.json => test_3d_acceleration.json} (100%) rename Regression/Checksum/benchmarks_json/{acceleration_psatd.json => test_3d_acceleration_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{acceleration_psatd_time_avg.json => test_3d_acceleration_psatd_time_avg.json} (100%) rename Regression/Checksum/benchmarks_json/{averaged_galilean_3d_psatd.json => test_3d_averaged_galilean_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{averaged_galilean_3d_psatd_hybrid.json => test_3d_averaged_galilean_psatd_hybrid.json} (100%) rename Regression/Checksum/benchmarks_json/{beam_beam_collision.json => test_3d_beam_beam_collision.json} (100%) rename Regression/Checksum/benchmarks_json/{collider_diagnostics.json => test_3d_collider_diagnostics.json} (100%) rename Regression/Checksum/benchmarks_json/{collision_iso.json => test_3d_collision_iso.json} (100%) rename Regression/Checksum/benchmarks_json/{collision_xyz.json => test_3d_collision_xyz.json} (100%) rename Regression/Checksum/benchmarks_json/{deuterium_deuterium_fusion_3d.json => test_3d_deuterium_deuterium_fusion.json} (100%) rename Regression/Checksum/benchmarks_json/{deuterium_deuterium_fusion_3d_intraspecies.json => test_3d_deuterium_deuterium_fusion_intraspecies.json} (100%) rename Regression/Checksum/benchmarks_json/{deuterium_tritium_fusion_3d.json => test_3d_deuterium_tritium_fusion.json} (100%) rename Regression/Checksum/benchmarks_json/{divb_cleaning_3d.json => test_3d_divb_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{dive_cleaning_3d.json => test_3d_dive_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere.json => test_3d_electrostatic_sphere.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_eb.json => test_3d_electrostatic_sphere_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_eb_mixed_bc.json => test_3d_electrostatic_sphere_eb_mixed_bc.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_eb_picmi.json => test_3d_electrostatic_sphere_eb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_lab_frame.json => test_3d_electrostatic_sphere_lab_frame.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_lab_frame_mr_emass_10.json => test_3d_electrostatic_sphere_lab_frame_mr_emass_10.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_rel_nodal.json => test_3d_electrostatic_sphere_rel_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_cube_3d.json => test_3d_embedded_boundary_cube.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_cube_3d_macroscopic.json => test_3d_embedded_boundary_cube_macroscopic.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_rotated_cube_3d.json => test_3d_embedded_boundary_rotated_cube.json} (100%) rename Regression/Checksum/benchmarks_json/{flux_injection_3d.json => test_3d_flux_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{focusing_gaussian_beam.json => test_3d_focusing_gaussian_beam.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_3d_psatd.json => test_3d_galilean_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_3d_psatd_current_correction.json => test_3d_galilean_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_3d_psatd_current_correction_psb.json => test_3d_galilean_psatd_current_correction_psb.json} (100%) rename Regression/Checksum/benchmarks_json/{gaussian_beam_picmi.json => test_3d_gaussian_beam_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{hard_edged_quadrupoles.json => test_3d_hard_edged_quadrupoles.json} (100%) rename Regression/Checksum/benchmarks_json/{hard_edged_quadrupoles_boosted.json => test_3d_hard_edged_quadrupoles_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{hard_edged_quadrupoles_moving.json => test_3d_hard_edged_quadrupoles_moving.json} (100%) rename Regression/Checksum/benchmarks_json/{initial_distribution.json => test_3d_initial_distribution.json} (100%) rename Regression/Checksum/benchmarks_json/{ion_stopping.json => test_3d_ion_stopping.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_fluid_3d.json => test_3d_langmuir_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d.json => test_3d_langmuir_multi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_nodal.json => test_3d_langmuir_multi_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_picmi.json => test_3d_langmuir_multi_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd.json => test_3d_langmuir_multi_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_current_correction.json => test_3d_langmuir_multi_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_current_correction_nodal.json => test_3d_langmuir_multi_psatd_current_correction_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_div_cleaning.json => test_3d_langmuir_multi_psatd_div_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_momentum_conserving.json => test_3d_langmuir_multi_psatd_momentum_conserving.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_multiJ.json => test_3d_langmuir_multi_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_multiJ_nodal.json => test_3d_langmuir_multi_psatd_multiJ_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_nodal.json => test_3d_langmuir_multi_psatd_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_single_precision.json => test_3d_langmuir_multi_psatd_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_vay_deposition.json => test_3d_langmuir_multi_psatd_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_psatd_vay_deposition_nodal.json => test_3d_langmuir_multi_psatd_vay_deposition_nodal.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_3d_single_precision.json => test_3d_langmuir_multi_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_3d.json => test_3d_laser_acceleration.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_btd.json => test_3d_laser_acceleration_btd.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_3d_picmi.json => test_3d_laser_acceleration_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_3d_single_precision_comms.json => test_3d_laser_acceleration_single_precision_comms.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_3d.json => test_3d_laser_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_lasy_file_3d.json => test_3d_laser_injection_from_lasy_file.json} (100%) rename Regression/Checksum/benchmarks_json/{load_external_field_3d_grid_picmi.json => test_3d_load_external_field_grid_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{load_external_field_3d_particle_picmi.json => test_3d_load_external_field_particle_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{magnetostatic_eb_3d.json => test_3d_magnetostatic_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{magnetostatic_eb_3d_picmi.json => test_3d_magnetostatic_eb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{nodal_electrostatic_solver.json => test_3d_nodal_electrostatic_solver.json} (100%) rename Regression/Checksum/benchmarks_json/{open_bc_poisson_solver.json => test_3d_open_bc_poisson_solver.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_boundaries_3d.json => test_3d_particle_boundaries.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_fields_diags.json => test_3d_particle_fields_diags.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_fields_diags_single_precision.json => test_3d_particle_fields_diags_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_pusher.json => test_3d_particle_pusher.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_3d.json => test_3d_particles_in_pml.json} (100%) rename Regression/Checksum/benchmarks_json/{particles_in_pml_3d_mr.json => test_3d_particles_in_pml_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{pec_field.json => test_3d_pec_field.json} (100%) rename Regression/Checksum/benchmarks_json/{pec_field_mr.json => test_3d_pec_field_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{pec_particle.json => test_3d_pec_particle.json} (100%) rename Regression/Checksum/benchmarks_json/{photon_pusher.json => test_3d_photon_pusher.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_boosted_3d.json => test_3d_plasma_acceleration_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_boosted_3d_hybrid.json => test_3d_plasma_acceleration_boosted_hybrid.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_3d_mr_picmi.json => test_3d_plasma_acceleration_mr_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_acceleration_3d_picmi.json => test_3d_plasma_acceleration_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_lens.json => test_3d_plasma_lens.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_lens_boosted.json => test_3d_plasma_lens_boosted.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_lens_hard_edged.json => test_3d_plasma_lens_hard_edged.json} (100%) rename Regression/Checksum/benchmarks_json/{plasma_lens_short.json => test_3d_plasma_lens_short.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_psatd_dive_divb_cleaning.json => test_3d_pml_psatd_dive_divb_cleaning.json} (100%) rename Regression/Checksum/benchmarks_json/{point_of_contact_eb_3d.json => test_3d_point_of_contact_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{proton_boron_fusion_3d.json => test_3d_proton_boron_fusion.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_breit_wheeler_3d.json => test_3d_qed_breit_wheeler.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_quantum_sync_3d.json => test_3d_qed_quantum_sync.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger_1.json => test_3d_qed_schwinger_1.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger_2.json => test_3d_qed_schwinger_2.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger_3.json => test_3d_qed_schwinger_3.json} (100%) rename Regression/Checksum/benchmarks_json/{qed_schwinger_4.json => test_3d_qed_schwinger_4.json} (100%) rename Regression/Checksum/benchmarks_json/{radiation_reaction.json => test_3d_radiation_reaction.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags.json => test_3d_reduced_diags.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_load_balance_costs_heuristic.json => test_3d_reduced_diags_load_balance_costs_heuristic.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_load_balance_costs_timers.json => test_3d_reduced_diags_load_balance_costs_timers.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_load_balance_costs_timers_psatd.json => test_3d_reduced_diags_load_balance_costs_timers_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{reduced_diags_single_precision.json => test_3d_reduced_diags_single_precision.json} (100%) rename Regression/Checksum/benchmarks_json/{relativistic_space_charge_initialization.json => test_3d_relativistic_space_charge_initialization.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_restart_eb.json => test_3d_restart_eb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{space_charge_initialization_3d.json => test_3d_space_charge_initialization.json} (100%) rename Regression/Checksum/benchmarks_json/{uniform_plasma_3d.json => test_3d_uniform_plasma.json} (100%) rename Regression/Checksum/benchmarks_json/{uniform_plasma_multiJ.json => test_3d_uniform_plasma_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{vay_deposition_3d.json => test_3d_vay_deposition.json} (100%) rename Regression/Checksum/benchmarks_json/{btd_rz.json => test_rz_btd.json} (100%) rename Regression/Checksum/benchmarks_json/{collision_rz.json => test_rz_collision.json} (100%) rename Regression/Checksum/benchmarks_json/{deuterium_tritium_fusion_rz.json => test_rz_deuterium_tritium_fusion.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_rz.json => test_rz_electrostatic_sphere.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_eb_rz.json => test_rz_electrostatic_sphere_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{electrostatic_sphere_eb_rz_mr.json => test_rz_electrostatic_sphere_eb_mr.json} (100%) rename Regression/Checksum/benchmarks_json/{embedded_boundary_diffraction.json => test_rz_embedded_boundary_diffraction.json} (100%) rename Regression/Checksum/benchmarks_json/{flux_injection_rz.json => test_rz_flux_injection.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_rz_psatd.json => test_rz_galilean_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_rz_psatd_current_correction.json => test_rz_galilean_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{galilean_rz_psatd_current_correction_psb.json => test_rz_galilean_psatd_current_correction_psb.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_fluid_rz.json => test_rz_langmuir_fluid.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_rz.json => test_rz_langmuir_multi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_rz_picmi.json => test_rz_langmuir_multi_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_rz_psatd.json => test_rz_langmuir_multi_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_rz_psatd_current_correction.json => test_rz_langmuir_multi_psatd_current_correction.json} (100%) rename Regression/Checksum/benchmarks_json/{langmuir_multi_rz_psatd_multiJ.json => test_rz_langmuir_multi_psatd_multiJ.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_rz.json => test_rz_laser_acceleration.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_acceleration_rz_picmi.json => test_rz_laser_acceleration_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_rz_lasy_file.json => test_rz_laser_injection_from_RZ_lasy_file.json} (100%) rename Regression/Checksum/benchmarks_json/{laser_injection_from_lasy_file_rz.json => test_rz_laser_injection_from_lasy_file.json} (100%) rename Regression/Checksum/benchmarks_json/{load_external_field_rz_grid.json => test_rz_load_external_field_grid.json} (100%) rename Regression/Checksum/benchmarks_json/{load_external_field_rz_particles.json => test_rz_load_external_field_particles.json} (100%) rename Regression/Checksum/benchmarks_json/{magnetostatic_eb_rz_picmi.json => test_rz_magnetostatic_eb_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{multi_J_rz_psatd.json => test_rz_multiJ_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{ohm_solver_em_modes_rz_picmi.json => test_rz_ohm_solver_em_modes_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{particle_boundary_interaction_picmi.json => test_rz_particle_boundary_interaction_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{pml_psatd_rz.json => test_rz_pml_psatd.json} (100%) rename Regression/Checksum/benchmarks_json/{point_of_contact_eb_rz.json => test_rz_point_of_contact_eb.json} (100%) rename Regression/Checksum/benchmarks_json/{scraping.json => test_rz_scraping.json} (100%) rename Regression/Checksum/benchmarks_json/{silver_mueller_rz_z.json => test_rz_silver_mueller_z.json} (100%) rename Regression/Checksum/benchmarks_json/{spacecraft_charging.json => test_rz_spacecraft_charging.json} (100%) diff --git a/.github/workflows/clang_sanitizers.yml b/.github/workflows/clang_sanitizers.yml index a20c344a6c9..5d7066bf161 100644 --- a/.github/workflows/clang_sanitizers.yml +++ b/.github/workflows/clang_sanitizers.yml @@ -63,10 +63,10 @@ jobs: #MPI implementations often leak memory export "ASAN_OPTIONS=detect_leaks=0" - mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base - mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d - mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base - mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base + mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_base_rz + mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration + mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_base_2d + mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_base_3d build_thread_sanitizer: name: Clang thread sanitizer @@ -144,17 +144,17 @@ jobs: export OMP_NUM_THREADS=2 - mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base warpx.serialize_initial_conditions = 0 - mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_base_rz warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_base_2d warpx.serialize_initial_conditions = 0 + mpirun -n 2 ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_base_3d warpx.serialize_initial_conditions = 0 git clone https://github.com/ECP-WarpX/warpx-data ../warpx-data cd Examples/Tests/embedded_circle ulimit -c unlimited - mpirun -n 2 ../../../build_EB/bin/warpx.2d inputs_2d_test_embedded_circle warpx.serialize_initial_conditions = 0 + mpirun -n 2 ../../../build_EB/bin/warpx.2d inputs_test_2d_embedded_circle warpx.serialize_initial_conditions = 0 save_pr_number: if: github.event_name == 'pull_request' diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml index fd53d77da4a..ef6f4acde03 100644 --- a/.github/workflows/insitu.yml +++ b/.github/workflows/insitu.yml @@ -54,10 +54,10 @@ jobs: cmake --build build -j 4 - name: Test run: | - cp Examples/Physics_applications/laser_acceleration/inputs_3d_base . + cp Examples/Physics_applications/laser_acceleration/inputs_base_3d . cp Examples/Physics_applications/laser_acceleration/3d_ascent_actions.yaml ascent_actions.yaml mpiexec -n 2 ./build/bin/warpx.3d \ - inputs_3d_base \ + inputs_base_3d \ max_step = 40 \ diag1.intervals = 30:40:10 \ diag1.format = ascent diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 53244aafd5c..148790420db 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -132,7 +132,7 @@ jobs: source /opt/intel/oneapi/setvars.sh set -e export OMP_NUM_THREADS=2 - Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py + Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py build_dpcc: name: oneAPI DPC++ SP diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 6c80bdfebab..450f762a8be 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -84,7 +84,7 @@ jobs: source py-venv/bin/activate export OMP_NUM_THREADS=1 - mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py + mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py save_pr_number: if: github.event_name == 'pull_request' diff --git a/.github/workflows/scripts/checkQEDTableGenerator.sh b/.github/workflows/scripts/checkQEDTableGenerator.sh index c5573915891..a773015c6c7 100755 --- a/.github/workflows/scripts/checkQEDTableGenerator.sh +++ b/.github/workflows/scripts/checkQEDTableGenerator.sh @@ -29,7 +29,7 @@ export OMP_NUM_THREADS=2 # Generate QED lookup tables using WarpX # ./build/bin/warpx.2d \ - ./Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d \ + ./Examples/Tests/qed/inputs_test_2d_qed_quantum_sync \ qed_bw.lookup_table_mode = "generate" \ qed_bw.tab_dndt_chi_min = 0.01 \ qed_bw.tab_dndt_chi_max = 100.0 \ @@ -70,7 +70,7 @@ diff qs_table_dndt qs_table_tool_dndt # Run a WarpX simulation using the lookup tables generated by the external tool # ./build/bin/warpx.2d \ - ./Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d \ + ./Examples/Tests/qed/inputs_test_2d_qed_quantum_sync \ qed_bw.lookup_table_mode = "load" \ qed_bw.load_table_from = "bw_table_tool" \ qed_qs.lookup_table_mode = "load" \ diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index fc28eaf5949..1b3f491a487 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,8 +39,8 @@ jobs: -DWarpX_MPI=OFF \ -DWarpX_QED=OFF cmake --build build -j 4 - ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base - ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base + ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_base_3d + ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_base_rz ccache -s du -hs ~/.cache/ccache @@ -82,8 +82,8 @@ jobs: -DWarpX_QED_TOOLS=ON cmake --build build -j 4 - ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d - ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_2d_base + ./build/bin/warpx.1d Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration + ./build/bin/warpx.2d Examples/Physics_applications/laser_acceleration/inputs_base_2d ccache -s du -hs ~/.cache/ccache @@ -133,8 +133,8 @@ jobs: -DWarpX_QED_TABLE_GEN=ON cmake --build build -j 4 - ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_3d_base - ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_rz_base + ./build/bin/warpx.3d Examples/Physics_applications/laser_acceleration/inputs_base_3d + ./build/bin/warpx.rz Examples/Physics_applications/laser_acceleration/inputs_base_rz ccache -s du -hs ~/.cache/ccache @@ -222,7 +222,7 @@ jobs: - name: run pywarpx run: | export OMP_NUM_THREADS=1 - mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py + mpirun -n 2 Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py save_pr_number: if: github.event_name == 'pull_request' diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index edd7f251682..d6030743524 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -54,7 +54,7 @@ jobs: run: | $env:PATH += ';C:/Program Files (x86)/WarpX/bin/' - python3 Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py + python3 Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # JSON writes are currently very slow (50min) with MSVC # --diagformat=openpmd @@ -118,5 +118,5 @@ jobs: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\vc\Auxiliary\build\vcvarsall.bat" x64 set "PATH=C:/Program Files (x86)/WarpX/bin/;%PATH%" - python3 Examples/Tests/gaussian_beam/inputs_2d_test_gaussian_beam_picmi.py --diagformat=openpmd + python3 Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py --diagformat=openpmd if errorlevel 1 exit 1 diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 84517f92efa..8aaa30e40d4 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -79,7 +79,7 @@ function(add_warpx_test file(COPY ${INPUTS_PATH} DESTINATION ${THIS_WORKING_DIR}) # copy base input files to run directory get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) - set(INPUTS_BASE ${INPUTS_DIR}/inputs_${SD}_base) + set(INPUTS_BASE ${INPUTS_DIR}/inputs_base_${SD}) if(EXISTS ${INPUTS_BASE}) file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) endif() diff --git a/Examples/Physics_applications/CMakeLists.txt b/Examples/Physics_applications/CMakeLists.txt index c4d0e76d06b..e4f8565a140 100644 --- a/Examples/Physics_applications/CMakeLists.txt +++ b/Examples/Physics_applications/CMakeLists.txt @@ -1,7 +1,7 @@ # Add tests (alphabetical order) ############################################## # -add_subdirectory(beam-beam_collision) +add_subdirectory(beam_beam_collision) add_subdirectory(capacitive_discharge) add_subdirectory(laser_acceleration) add_subdirectory(laser_ion) diff --git a/Examples/Physics_applications/beam-beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt similarity index 52% rename from Examples/Physics_applications/beam-beam_collision/CMakeLists.txt rename to Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index eee45df17b2..007f7cd2a84 100644 --- a/Examples/Physics_applications/beam-beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# beam_beam_collision ######################################################### -# add_warpx_test( - beam_beam_collision # name + test_3d_beam_beam_collision # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision # inputs + Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output ) diff --git a/Examples/Physics_applications/beam-beam_collision/README.rst b/Examples/Physics_applications/beam_beam_collision/README.rst similarity index 100% rename from Examples/Physics_applications/beam-beam_collision/README.rst rename to Examples/Physics_applications/beam_beam_collision/README.rst diff --git a/Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision b/Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision similarity index 100% rename from Examples/Physics_applications/beam-beam_collision/inputs_3d_test_beam_beam_collision rename to Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index b878b3ff33a..6904b3b88df 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -2,65 +2,55 @@ # # FIXME -# background_mcc_1d_picmi ##################################################### -# #add_warpx_test( -# background_mcc_1d_picmi # name +# test_1d_background_mcc_picmi # name # 1 # dims # 2 # nprocs # OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py # inputs +# Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py # inputs # Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis # diags/diag1000050 # output # "--test --pythonsolver" # optional command-line arguments #) -# background_mcc ############################################################## -# add_warpx_test( - background_mcc # name + test_2d_background_mcc # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc # inputs + Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output ) # FIXME -# background_mcc_dp_psp ####################################################### -# #add_warpx_test( -# background_mcc_dp_psp # name +# test_2d_background_mcc_dp_psp # name # 2 # dims # 2 # nprocs # OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_dp_psp # inputs +# Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output #) -# background_mcc_picmi ######################################################## -# add_warpx_test( - background_mcc_picmi # name + test_2d_background_mcc_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py # inputs + Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output ) # FIXME -# dsmc_1d_picmi ############################################################### -# #add_warpx_test( -# dsmc_1d_picmi # name +# test_1d_dsmc_picmi # name # 1 # dims # 2 # nprocs # OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py # inputs +# Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py # inputs # Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis # diags/diag1000050 # output # "--test --dsmc" # optional command-line arguments diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc b/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc deleted file mode 100644 index d143741d2ab..00000000000 --- a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_2d_base - -# test input parameters -warpx.abort_on_warning_threshold = high diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py b/Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py similarity index 100% rename from Examples/Physics_applications/capacitive_discharge/inputs_1d_base_picmi.py rename to Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d_base b/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc similarity index 98% rename from Examples/Physics_applications/capacitive_discharge/inputs_2d_base rename to Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc index 2b11fd12978..e42e531c9e2 100644 --- a/Examples/Physics_applications/capacitive_discharge/inputs_2d_base +++ b/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc @@ -13,6 +13,7 @@ warpx.const_dt = 1.0/(400*freq) warpx.do_electrostatic = labframe warpx.self_fields_required_precision = 1e-06 warpx.use_filter = 0 +warpx.abort_on_warning_threshold = high amr.n_cell = 128 8 amr.max_grid_size = 128 diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py b/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py similarity index 100% rename from Examples/Physics_applications/capacitive_discharge/inputs_2d_test_background_mcc_picmi.py rename to Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 0e551603438..a0d372d0d49 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -1,170 +1,142 @@ # Add tests (alphabetical order) ############################################## # -# laser_acceleration_1d ####################################################### -# add_warpx_test( - laser_acceleration_1d # name + test_1d_laser_acceleration # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) -# laser_acceleration_1d_fluid ################################################# -# add_warpx_test( - laser_acceleration_1d_fluid # name + test_1d_laser_acceleration_fluid # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis diags/diag1040000 # output ) -# laser_acceleration_1d_fluid_boosted ######################################### -# add_warpx_test( - laser_acceleration_1d_fluid_boosted # name + test_1d_laser_acceleration_fluid_boosted # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis diags/diag1000001 # output ) -# laser_acceleration_1d_picmi ################################################# -# add_warpx_test( - laser_acceleration_1d_picmi # name + test_1d_laser_acceleration_picmi # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) -# laser_acceleration_2d_boosted ############################################### -# add_warpx_test( - laser_acceleration_2d_boosted # name + test_2d_laser_acceleration_boosted # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output ) -# laser_acceleration_2d_mr #################################################### -# add_warpx_test( - laser_acceleration_2d_mr # name + test_2d_laser_acceleration_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output ) -# laser_acceleration_2d_mr_picmi ############################################## -# add_warpx_test( - laser_acceleration_2d_mr_picmi # name + test_2d_laser_acceleration_mr_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output ) -# laser_acceleration_3d ####################################################### -# add_warpx_test( - laser_acceleration_3d # name + test_3d_laser_acceleration # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output ) -# laser_acceleration_3d_picmi ################################################# -# add_warpx_test( - laser_acceleration_3d_picmi # name + test_3d_laser_acceleration_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) -# laser_acceleration_3d_single_precision_comms ################################ -# add_warpx_test( - laser_acceleration_3d_single_precision_comms # name + test_3d_laser_acceleration_single_precision_comms # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output ) -# laser_acceleration_rz ####################################################### -# add_warpx_test( - laser_acceleration_rz # name + test_rz_laser_acceleration # name RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# laser_acceleration_rz_opmd ################################################## -# add_warpx_test( - laser_acceleration_rz_opmd # name + test_rz_laser_acceleration_opmd # name RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd # inputs Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis diags/diag1/ # output ) -# laser_acceleration_rz_picmi ################################################# -# add_warpx_test( - laser_acceleration_rz_picmi # name + test_rz_laser_acceleration_picmi # name RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# refined_injection ########################################################### -# add_warpx_test( - refined_injection # name + test_2d_refined_injection # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection # inputs + Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection # inputs Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis diags/diag1000200 # output ) diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_base b/Examples/Physics_applications/laser_acceleration/inputs_base_2d similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_base rename to Examples/Physics_applications/laser_acceleration/inputs_base_2d diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_base b/Examples/Physics_applications/laser_acceleration/inputs_base_3d similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_3d_base rename to Examples/Physics_applications/laser_acceleration/inputs_base_3d diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_base b/Examples/Physics_applications/laser_acceleration/inputs_base_rz similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_rz_base rename to Examples/Physics_applications/laser_acceleration/inputs_base_rz diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d b/Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d rename to Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid b/Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid rename to Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted b/Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_fluid_boosted rename to Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted diff --git a/Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py b/Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_1d_test_laser_acceleration_1d_picmi.py rename to Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_boosted rename to Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr similarity index 52% rename from Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d rename to Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr index 287576a9c7f..5a98fa590ee 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr @@ -1,2 +1,2 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_2d diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr_picmi.py rename to Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection similarity index 81% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection rename to Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection index f30c57ca78f..ed836e87e6b 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_refined_injection +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters amr.ref_ratio_vect = 2 1 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr b/Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration similarity index 52% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr rename to Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration index a9e0a64cbc5..7665a846eef 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration @@ -1,2 +1,2 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_3d diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py b/Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_picmi.py rename to Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py diff --git a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms b/Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms similarity index 79% rename from Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms rename to Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms index be35ae541df..99155ed0ecc 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_3d_test_laser_acceleration_3d_single_precision_comms +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters warpx.do_single_precision_comms = 1 diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz b/Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration similarity index 83% rename from Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz rename to Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration index 998b983e736..5879688b00a 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters diag1.dump_rz_modes = 1 diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd b/Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd similarity index 91% rename from Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd rename to Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd index 2c29ed146c4..16a84950996 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_opmd +++ b/Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters diag1.fields_to_plot = Er Bt Bz jr jt jz rho part_per_cell part_per_grid rho_beam rho_electrons diff --git a/Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py b/Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_acceleration/inputs_rz_test_laser_acceleration_rz_picmi.py rename to Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index 24f298ada0b..bf670231ed4 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# laser_ion_acc_2d ############################################################ -# add_warpx_test( - laser_ion_acc_2d # name + test_2d_laser_ion_acc # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d # inputs + Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output ) -# laser_ion_acc_2d_picmi ###################################################### -# add_warpx_test( - laser_ion_acc_2d_picmi # name + test_2d_laser_ion_acc_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py # inputs + Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output ) diff --git a/Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d b/Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc similarity index 100% rename from Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d rename to Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc diff --git a/Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py b/Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py similarity index 100% rename from Examples/Physics_applications/laser_ion/inputs_2d_test_laser_ion_acc_2d_picmi.py rename to Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index ae15add9828..0675d0298f6 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -1,98 +1,82 @@ # Add tests (alphabetical order) ############################################## # -# plasma_acceleration_1d_picmi ################################################ -# add_warpx_test( - plasma_acceleration_1d_picmi # name + test_1d_plasma_acceleration_picmi # name 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1001000 # output ) -# plasma_acceleration_2d_mr ################################################### -# add_warpx_test( - plasma_acceleration_2d_mr # name + test_2d_plasma_acceleration_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output ) -# plasma_acceleration_2d_mr_momentum_conserving ############################### -# add_warpx_test( - plasma_acceleration_2d_mr_momentum_conserving # name + test_2d_plasma_acceleration_mr_momentum_conserving # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output ) -# plasma_acceleration_boosted_2d ############################################## -# add_warpx_test( - plasma_acceleration_boosted_2d # name + test_2d_plasma_acceleration_boosted # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output ) -# plasma_acceleration_boosted_3d ############################################## -# add_warpx_test( - plasma_acceleration_boosted_3d # name + test_3d_plasma_acceleration_boosted # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000005 # output ) -# plasma_acceleration_boosted_3d_hybrid ####################################### -# add_warpx_test( - plasma_acceleration_boosted_3d_hybrid # name + test_3d_plasma_acceleration_boosted_hybrid # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000025 # output ) -# plasma_acceleration_3d_picmi ################################################ -# add_warpx_test( - plasma_acceleration_3d_picmi # name + test_3d_plasma_acceleration_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# plasma_acceleration_3d_mr_picmi ############################################# -# add_warpx_test( - plasma_acceleration_3d_mr_picmi # name + test_3d_plasma_acceleration_mr_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py # inputs + Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output ) diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_base b/Examples/Physics_applications/plasma_acceleration/inputs_base_2d similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d_base rename to Examples/Physics_applications/plasma_acceleration/inputs_base_2d diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_base b/Examples/Physics_applications/plasma_acceleration/inputs_base_3d similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_base rename to Examples/Physics_applications/plasma_acceleration/inputs_base_3d diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py b/Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_1d_test_plasma_acceleration_1d_picmi.py rename to Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d b/Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_boosted_2d rename to Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d b/Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr similarity index 52% rename from Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d rename to Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr index 287576a9c7f..5a98fa590ee 100644 --- a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d +++ b/Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr @@ -1,2 +1,2 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_2d diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving b/Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving similarity index 80% rename from Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving rename to Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving index 8ce4ee3d1d0..c21068325a0 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_2d_test_plasma_acceleration_2d_mr_momentum_conserving +++ b/Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.field_gathering = momentum-conserving diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted similarity index 73% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d rename to Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted index a01e344723e..62abe8e9df8 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d +++ b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters max_step = 5 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid similarity index 84% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid rename to Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid index d29c1775c59..3c085b64b1b 100644 --- a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_boosted_3d_hybrid +++ b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters max_step = 25 diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_mr_picmi.py rename to Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py diff --git a/Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py b/Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/inputs_3d_test_plasma_acceleration_3d_picmi.py rename to Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index 678abd0c726..f9a87cf65cd 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# plasma_mirror ############################################################### -# add_warpx_test( - plasma_mirror # name + test_2d_plasma_mirror # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror # inputs + Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output ) diff --git a/Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror b/Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror similarity index 100% rename from Examples/Physics_applications/plasma_mirror/inputs_2d_test_plasma_mirror rename to Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index a2f4cf7b404..448451fecb0 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# spacecraft_charging ######################################################### -# if(WarpX_EB) add_warpx_test( - spacecraft_charging # name + test_rz_spacecraft_charging # name RZ # dims 2 # nprocs ON # eb - Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py # inputs + Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py # inputs Examples/Physics_applications/spacecraft_charging/analysis.py # analysis diags/diag1/ # output ) diff --git a/Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py b/Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py similarity index 100% rename from Examples/Physics_applications/spacecraft_charging/inputs_rz_test_spacecraft_charging_picmi.py rename to Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index dfb6f7dbd8e..c42122ce06b 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# uniform_plasma_2d ########################################################### -# add_warpx_test( - uniform_plasma_2d # name + test_2d_uniform_plasma # name 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d # inputs + Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# uniform_plasma_3d ########################################################### -# add_warpx_test( - uniform_plasma_3d # name + test_3d_uniform_plasma # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d # inputs + Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# uniform_plasma_3d_restart ################################################### -# add_warpx_test( - uniform_plasma_3d_restart # name + test_3d_uniform_plasma_restart # name 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart # inputs + Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart b/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart deleted file mode 100644 index e2011f43f91..00000000000 --- a/Examples/Physics_applications/uniform_plasma/inputs_3d_test_uniform_plasma_3d_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_base - -# test input parameters -amr.restart = ../uniform_plasma_3d/diags/chk000006 diff --git a/Examples/Physics_applications/uniform_plasma/inputs_3d_base b/Examples/Physics_applications/uniform_plasma/inputs_base_3d similarity index 100% rename from Examples/Physics_applications/uniform_plasma/inputs_3d_base rename to Examples/Physics_applications/uniform_plasma/inputs_base_3d diff --git a/Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d b/Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma similarity index 100% rename from Examples/Physics_applications/uniform_plasma/inputs_2d_test_uniform_plasma_2d rename to Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma diff --git a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma similarity index 52% rename from Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr rename to Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma index a9e0a64cbc5..7665a846eef 100644 --- a/Examples/Physics_applications/laser_acceleration/inputs_2d_test_laser_acceleration_2d_mr +++ b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma @@ -1,2 +1,2 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_3d diff --git a/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart new file mode 100644 index 00000000000..54df9c1e022 --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_3d_uniform_plasma + +# test input parameters +amr.restart = ../test_3d_uniform_plasma/diags/chk000006 diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index 790106de51b..0b0eb8dce14 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# hard_edged_quadrupoles ###################################################### -# add_warpx_test( - hard_edged_quadrupoles # name + test_3d_hard_edged_quadrupoles # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles # inputs + Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output ) -# hard_edged_quadrupoles_boosted ############################################## -# add_warpx_test( - hard_edged_quadrupoles_boosted # name + test_3d_hard_edged_quadrupoles_boosted # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted # inputs + Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output ) -# hard_edged_quadrupoles_moving ############################################### -# add_warpx_test( - hard_edged_quadrupoles_moving # name + test_3d_hard_edged_quadrupoles_moving # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving # inputs + Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output ) diff --git a/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles b/Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles similarity index 100% rename from Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles rename to Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles diff --git a/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted b/Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted similarity index 100% rename from Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_boosted rename to Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted diff --git a/Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving b/Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving similarity index 100% rename from Examples/Tests/accelerator_lattice/inputs_3d_test_hard_edged_quadrupoles_moving rename to Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index ed460d868da..23ac9ed35c8 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# laser_acceleration_btd ###################################################### -# add_warpx_test( - laser_acceleration_btd # name + test_3d_laser_acceleration_btd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd # inputs + Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output ) diff --git a/Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd b/Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd similarity index 100% rename from Examples/Tests/boosted_diags/inputs_3d_test_laser_acceleration_btd rename to Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index e77467b3db8..9b0dd97c3f9 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# particle_boundaries_3d ###################################################### -# add_warpx_test( - particle_boundaries_3d # name + test_3d_particle_boundaries # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d # inputs + Examples/Tests/boundaries/inputs_test_3d_particle_boundaries # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output ) diff --git a/Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d b/Examples/Tests/boundaries/inputs_test_3d_particle_boundaries similarity index 100% rename from Examples/Tests/boundaries/inputs_3d_test_particle_boundaries_3d rename to Examples/Tests/boundaries/inputs_test_3d_particle_boundaries diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 56b27155876..09fea2365ea 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# btd_rz ###################################################################### -# add_warpx_test( - btd_rz # name + test_rz_btd # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/btd_rz/inputs_rz_test_btd_rz # inputs - Examples/Tests/btd_rz/analysis_btd_laser_antenna.py # analysis + Examples/Tests/btd_rz/inputs_test_rz_btd # inputs + Examples/Tests/btd_rz/analysis.py # analysis diags/diag1000289 # output ) diff --git a/Examples/Tests/btd_rz/analysis_btd_laser_antenna.py b/Examples/Tests/btd_rz/analysis.py similarity index 100% rename from Examples/Tests/btd_rz/analysis_btd_laser_antenna.py rename to Examples/Tests/btd_rz/analysis.py diff --git a/Examples/Tests/btd_rz/inputs_rz_test_btd_rz b/Examples/Tests/btd_rz/inputs_test_rz_btd similarity index 100% rename from Examples/Tests/btd_rz/inputs_rz_test_btd_rz rename to Examples/Tests/btd_rz/inputs_test_rz_btd diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index d9438a224b9..e78ae64cc7d 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# collider_diagnostics ######################################################## -# add_warpx_test( - collider_diagnostics # name + test_3d_collider_diagnostics # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics # inputs - Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py # analysis + Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics # inputs + Examples/Tests/collider_relevant_diags/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py b/Examples/Tests/collider_relevant_diags/analysis.py similarity index 99% rename from Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py rename to Examples/Tests/collider_relevant_diags/analysis.py index 62160b35b66..e8e169790c2 100755 --- a/Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py +++ b/Examples/Tests/collider_relevant_diags/analysis.py @@ -61,7 +61,7 @@ def dL_dt(): return lumi -input_dict = parse_input_file("inputs_3d_test_collider_diagnostics") +input_dict = parse_input_file("inputs_test_3d_collider_diagnostics") Ex, Ey, Ez = [float(w) for w in input_dict["particles.E_external_particle"]] Bx, By, Bz = [float(w) for w in input_dict["particles.B_external_particle"]] diff --git a/Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics b/Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics similarity index 100% rename from Examples/Tests/collider_relevant_diags/inputs_3d_test_collider_diagnostics rename to Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index fa6bb90c909..8d2e733a93a 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -1,74 +1,62 @@ # Add tests (alphabetical order) ############################################## # -# collision_z ################################################################# -# add_warpx_test( - collision_z # name + test_1d_collision_z # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/collision/inputs_1d_test_collision_z # inputs + Examples/Tests/collision/inputs_test_1d_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output ) -# collision_iso ############################################################### -# add_warpx_test( - collision_iso # name + test_3d_collision_iso # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_3d_test_collision_iso # inputs + Examples/Tests/collision/inputs_test_3d_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output ) -# collision_rz ################################################################ -# add_warpx_test( - collision_rz # name + test_rz_collision # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_rz_test_collision_rz # inputs + Examples/Tests/collision/inputs_test_rz_collision # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output ) -# collision_xyz ############################################################### -# add_warpx_test( - collision_xyz # name + test_3d_collision_xyz # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_3d_test_collision_xyz # inputs + Examples/Tests/collision/inputs_test_3d_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis diags/diag1000150 # output ) -# collision_xz ################################################################ -# add_warpx_test( - collision_xz # name + test_2d_collision_xz # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_2d_test_collision_xz # inputs + Examples/Tests/collision/inputs_test_2d_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output ) -# collision_xz_picmi ########################################################## -# add_warpx_test( - collision_xz_picmi # name + test_2d_collision_xz_picmi # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py # inputs + Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output ) diff --git a/Examples/Tests/collision/inputs_1d_test_collision_z b/Examples/Tests/collision/inputs_test_1d_collision_z similarity index 100% rename from Examples/Tests/collision/inputs_1d_test_collision_z rename to Examples/Tests/collision/inputs_test_1d_collision_z diff --git a/Examples/Tests/collision/inputs_2d_test_collision_xz b/Examples/Tests/collision/inputs_test_2d_collision_xz similarity index 100% rename from Examples/Tests/collision/inputs_2d_test_collision_xz rename to Examples/Tests/collision/inputs_test_2d_collision_xz diff --git a/Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py b/Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py similarity index 100% rename from Examples/Tests/collision/inputs_2d_test_collision_xz_picmi.py rename to Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py diff --git a/Examples/Tests/collision/inputs_3d_test_collision_iso b/Examples/Tests/collision/inputs_test_3d_collision_iso similarity index 100% rename from Examples/Tests/collision/inputs_3d_test_collision_iso rename to Examples/Tests/collision/inputs_test_3d_collision_iso diff --git a/Examples/Tests/collision/inputs_3d_test_collision_xyz b/Examples/Tests/collision/inputs_test_3d_collision_xyz similarity index 100% rename from Examples/Tests/collision/inputs_3d_test_collision_xyz rename to Examples/Tests/collision/inputs_test_3d_collision_xyz diff --git a/Examples/Tests/collision/inputs_rz_test_collision_rz b/Examples/Tests/collision/inputs_test_rz_collision similarity index 100% rename from Examples/Tests/collision/inputs_rz_test_collision_rz rename to Examples/Tests/collision/inputs_test_rz_collision diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 25a4a15b9eb..9ab75023ae2 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# divb_cleaning_3d ############################################################ -# add_warpx_test( - divb_cleaning_3d # name + test_3d_divb_cleaning # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d # inputs + Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output ) diff --git a/Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d b/Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning similarity index 100% rename from Examples/Tests/divb_cleaning/inputs_3d_test_divb_cleaning_3d rename to Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 2710f58d383..1ad5745d63f 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# dive_cleaning_2d ############################################################ -# add_warpx_test( - dive_cleaning_2d # name + test_2d_dive_cleaning # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d # inputs + Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output ) -# dive_cleaning_3d ############################################################ -# add_warpx_test( - dive_cleaning_3d # name + test_3d_dive_cleaning # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d # inputs + Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output ) diff --git a/Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d b/Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning similarity index 100% rename from Examples/Tests/dive_cleaning/inputs_2d_test_dive_cleaning_2d rename to Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning diff --git a/Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d b/Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning similarity index 100% rename from Examples/Tests/dive_cleaning/inputs_3d_test_dive_cleaning_3d rename to Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 18cc451abbe..9dc477076ed 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# dirichlet_bc ################################################################ -# add_warpx_test( - dirichlet_bc # name + test_2d_dirichlet_bc # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc # inputs + Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output ) -# dirichlet_bc_picmi ########################################################## -# add_warpx_test( - dirichlet_bc_picmi # name + test_2d_dirichlet_bc_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py # inputs + Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output ) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc b/Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc similarity index 100% rename from Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc rename to Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc diff --git a/Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py b/Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py similarity index 100% rename from Examples/Tests/electrostatic_dirichlet_bc/inputs_2d_test_dirichlet_bc_picmi.py rename to Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 30708d51874..c7106e3cb8f 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -1,62 +1,52 @@ # Add tests (alphabetical order) ############################################## # -# electrostatic_sphere ######################################################## -# add_warpx_test( - electrostatic_sphere # name + test_3d_electrostatic_sphere # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere # inputs + Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output ) -# electrostatic_sphere_lab_frame ############################################## -# add_warpx_test( - electrostatic_sphere_lab_frame # name + test_3d_electrostatic_sphere_lab_frame # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame # inputs + Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output ) -# electrostatic_sphere_lab_frame_mr_emass_10 ################################## -# add_warpx_test( - electrostatic_sphere_lab_frame_mr_emass_10 # name + test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 # inputs + Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output ) -# electrostatic_sphere_rel_nodal ############################################## -# add_warpx_test( - electrostatic_sphere_rel_nodal # name + test_3d_electrostatic_sphere_rel_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal # inputs + Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output ) -# electrostatic_sphere_rz ##################################################### -# add_warpx_test( - electrostatic_sphere_rz # name + test_rz_electrostatic_sphere # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz # inputs + Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output ) diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_base b/Examples/Tests/electrostatic_sphere/inputs_base_3d similarity index 100% rename from Examples/Tests/electrostatic_sphere/inputs_3d_base rename to Examples/Tests/electrostatic_sphere/inputs_base_3d diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere similarity index 80% rename from Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere rename to Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere index 7743ddf9b77..d89395e9d74 100644 --- a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere +++ b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame similarity index 85% rename from Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame rename to Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame index 61d0c42cd25..da97ae8afe7 100644 --- a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame +++ b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters diag2.electron.variables = x y z ux uy uz w phi diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 similarity index 93% rename from Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 rename to Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 index 27a9dab24cf..481cc65f030 100644 --- a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_lab_frame_mr_emass_10 +++ b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters amr.max_level = 1 diff --git a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal similarity index 84% rename from Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal rename to Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal index 49cfedbea05..96bff8aa9c7 100644 --- a/Examples/Tests/electrostatic_sphere/inputs_3d_test_electrostatic_sphere_rel_nodal +++ b/Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters warpx.abort_on_warning_threshold = medium diff --git a/Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz b/Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere similarity index 100% rename from Examples/Tests/electrostatic_sphere/inputs_rz_test_electrostatic_sphere_rz rename to Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 570058de015..3bf54e37229 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -1,71 +1,61 @@ # Add tests (alphabetical order) ############################################## # -# electrostatic_sphere_eb ##################################################### -# if(WarpX_EB) add_warpx_test( - electrostatic_sphere_eb # name + test_3d_electrostatic_sphere_eb # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb # inputs + Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output ) endif() -# electrostatic_sphere_eb_mixed_bc ############################################ -# if(WarpX_EB) add_warpx_test( - electrostatic_sphere_eb_mixed_bc # name + test_3d_electrostatic_sphere_eb_mixed_bc # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc # inputs + Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output ) endif() -# electrostatic_sphere_eb_picmi ############################################### -# if(WarpX_EB) add_warpx_test( - electrostatic_sphere_eb_picmi # name + test_3d_electrostatic_sphere_eb_picmi # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py # inputs + Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000002 # output ) endif() -# electrostatic_sphere_eb_rz ################################################## -# if(WarpX_EB) add_warpx_test( - electrostatic_sphere_eb_rz # name + test_rz_electrostatic_sphere_eb # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz # inputs + Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output ) endif() -# electrostatic_sphere_eb_rz_mr ############################################### -# if(WarpX_EB) add_warpx_test( - electrostatic_sphere_eb_rz_mr # name + test_rz_electrostatic_sphere_eb_mr # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr # inputs + Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output ) diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb b/Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb rename to Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc b/Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_mixed_bc rename to Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py b/Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/inputs_3d_test_electrostatic_sphere_eb_picmi.py rename to Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz b/Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz rename to Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb diff --git a/Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr b/Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr similarity index 100% rename from Examples/Tests/electrostatic_sphere_eb/inputs_rz_test_electrostatic_sphere_eb_rz_mr rename to Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 2afb81f8b9a..13f2a45b454 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -1,43 +1,37 @@ # Add tests (alphabetical order) ############################################## # -# embedded_boundary_cube_2d ################################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_cube_2d # name + test_2d_embedded_boundary_cube # name 2 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d # inputs + Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output ) endif() -# embedded_boundary_cube_3d ################################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_cube_3d # name + test_3d_embedded_boundary_cube # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d # inputs + Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output ) endif() -# embedded_boundary_cube_3d_macroscopic ####################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_cube_3d_macroscopic # name + test_3d_embedded_boundary_cube_macroscopic # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic # inputs + Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output ) diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d_base b/Examples/Tests/embedded_boundary_cube/inputs_base_3d similarity index 100% rename from Examples/Tests/embedded_boundary_cube/inputs_3d_base rename to Examples/Tests/embedded_boundary_cube/inputs_base_3d diff --git a/Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d b/Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube similarity index 100% rename from Examples/Tests/embedded_boundary_cube/inputs_2d_test_embedded_boundary_cube_2d rename to Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d b/Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube similarity index 53% rename from Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d rename to Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube index 7cd29a5648b..9d612bd62da 100644 --- a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d +++ b/Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube @@ -1,2 +1,2 @@ # base inpute parameters -FILE = inputs_3d_base +FILE = inputs_base_3d diff --git a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic b/Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic similarity index 89% rename from Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic rename to Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic index 647c8836524..1bcb49dec54 100644 --- a/Examples/Tests/embedded_boundary_cube/inputs_3d_test_embedded_boundary_cube_3d_macroscopic +++ b/Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.em_solver_medium = macroscopic diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index a97e506040f..23eea586627 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# embedded_boundary_diffraction ############################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_diffraction # name + test_rz_embedded_boundary_diffraction # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction # inputs + Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output ) diff --git a/Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction b/Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction similarity index 100% rename from Examples/Tests/embedded_boundary_diffraction/inputs_rz_test_embedded_boundary_diffraction rename to Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 66b56ae524c..f6b6af5561f 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# embedded_boundary_picmi ##################################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_picmi # name + test_3d_embedded_boundary_picmi # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py # inputs + Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 ) diff --git a/Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py b/Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py similarity index 100% rename from Examples/Tests/embedded_boundary_python_api/inputs_3d_test_embedded_boundary_picmi.py rename to Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 53e9b9681b9..ffae709bdb4 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -1,29 +1,25 @@ # Add tests (alphabetical order) ############################################## # -# embedded_boundary_rotated_cube_2d ########################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_rotated_cube_2d # name + test_2d_embedded_boundary_rotated_cube # name 2 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d # inputs + Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 ) endif() -# embedded_boundary_rotated_cube_3d ########################################### -# if(WarpX_EB) add_warpx_test( - embedded_boundary_rotated_cube_3d # name + test_3d_embedded_boundary_rotated_cube # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d # inputs + Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 ) diff --git a/Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d b/Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube similarity index 100% rename from Examples/Tests/embedded_boundary_rotated_cube/inputs_2d_test_embedded_boundary_rotated_cube_2d rename to Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube diff --git a/Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d b/Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube similarity index 100% rename from Examples/Tests/embedded_boundary_rotated_cube/inputs_3d_test_embedded_boundary_rotated_cube_3d rename to Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index f6549c1c87f..c37db535a7a 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# embedded_circle ############################################################# -# if(WarpX_EB) add_warpx_test( - embedded_circle # name + test_2d_embedded_circle # name 2 # dims 2 # nprocs ON # eb - Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle # inputs + Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle # inputs Examples/Tests/embedded_circle/analysis.py # analysis diags/diag1000011 ) diff --git a/Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle b/Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle similarity index 100% rename from Examples/Tests/embedded_circle/inputs_2d_test_embedded_circle rename to Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index 492e5052c47..bb96eae6551 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# energy_conserving_thermal_plasma ############################################ -# add_warpx_test( - energy_conserving_thermal_plasma # name + test_2d_energy_conserving_thermal_plasma # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma # inputs + Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output ) diff --git a/Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma b/Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma similarity index 100% rename from Examples/Tests/energy_conserving_thermal_plasma/inputs_2d_test_energy_conserving_thermal_plasma rename to Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index b6518a6e011..692c5bbabde 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -1,16 +1,14 @@ # Add tests (alphabetical order) ############################################## # -# field_probe ################################################################# -# if(WarpX_EB) add_warpx_test( - field_probe # name + test_2d_field_probe # name 2 # dims 2 # nprocs ON # eb - Examples/Tests/field_probe/inputs_2d_test_field_probe # inputs - Examples/Tests/field_probe/analysis_field_probe.py # analysis + Examples/Tests/field_probe/inputs_test_2d_field_probe # inputs + Examples/Tests/field_probe/analysis.py # analysis diags/diag1000544 # output ) endif() diff --git a/Examples/Tests/field_probe/analysis_field_probe.py b/Examples/Tests/field_probe/analysis.py similarity index 100% rename from Examples/Tests/field_probe/analysis_field_probe.py rename to Examples/Tests/field_probe/analysis.py diff --git a/Examples/Tests/field_probe/inputs_2d_test_field_probe b/Examples/Tests/field_probe/inputs_test_2d_field_probe similarity index 100% rename from Examples/Tests/field_probe/inputs_2d_test_field_probe rename to Examples/Tests/field_probe/inputs_test_2d_field_probe diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index f78e7406443..5b63282681e 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# flux_injection_3d ########################################################### -# add_warpx_test( - flux_injection_3d # name + test_3d_flux_injection # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d # inputs + Examples/Tests/flux_injection/inputs_test_3d_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output ) -# flux_injection_rz ########################################################### -# add_warpx_test( - flux_injection_rz # name + test_rz_flux_injection # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz # inputs + Examples/Tests/flux_injection/inputs_test_rz_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output ) diff --git a/Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d b/Examples/Tests/flux_injection/inputs_test_3d_flux_injection similarity index 100% rename from Examples/Tests/flux_injection/inputs_3d_test_flux_injection_3d rename to Examples/Tests/flux_injection/inputs_test_3d_flux_injection diff --git a/Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz b/Examples/Tests/flux_injection/inputs_test_rz_flux_injection similarity index 100% rename from Examples/Tests/flux_injection/inputs_rz_test_flux_injection_rz rename to Examples/Tests/flux_injection/inputs_test_rz_flux_injection diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 62e724be736..87c08e1bf69 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# focusing_gaussian_beam ###################################################### -# add_warpx_test( - focusing_gaussian_beam # name + test_3d_focusing_gaussian_beam # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam # inputs - Examples/Tests/gaussian_beam/analysis_focusing_beam.py # analysis + Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam # inputs + Examples/Tests/gaussian_beam/analysis.py # analysis diags/diag1000000 # output ) -# gaussian_beam_picmi ######################################################### -# add_warpx_test( - gaussian_beam_picmi # name + test_3d_gaussian_beam_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py # inputs + Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/gaussian_beam/analysis_focusing_beam.py b/Examples/Tests/gaussian_beam/analysis.py similarity index 100% rename from Examples/Tests/gaussian_beam/analysis_focusing_beam.py rename to Examples/Tests/gaussian_beam/analysis.py diff --git a/Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam b/Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam similarity index 100% rename from Examples/Tests/gaussian_beam/inputs_3d_test_focusing_gaussian_beam rename to Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam diff --git a/Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py b/Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py similarity index 100% rename from Examples/Tests/gaussian_beam/inputs_3d_test_gaussian_beam_picmi.py rename to Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 74c6c307160..bcf79702c66 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -1,50 +1,42 @@ # Add tests (alphabetical order) ############################################## # -# semi_implicit_picard_1d ##################################################### -# add_warpx_test( - semi_implicit_picard_1d # name + test_1d_semi_implicit_picard # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d # inputs + Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output ) -# theta_implicit_jfnk_vandb_2d ################################################ -# add_warpx_test( - theta_implicit_jfnk_vandb_2d # name - 2 # dims + test_1d_theta_implicit_picard # name + 1 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d # inputs - Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis - diags/diag1000020 # output + Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard # inputs + Examples/Tests/implicit/analysis_1d.py # analysis + diags/diag1000100 # output ) -# theta_implicit_jfnk_vandb_2d_picmi ########################################## -# add_warpx_test( - theta_implicit_jfnk_vandb_2d_picmi # name + test_2d_theta_implicit_jfnk_vandb # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py # inputs + Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output ) -# theta_implicit_picard_1d #################################################### -# add_warpx_test( - theta_implicit_picard_1d # name - 1 # dims + test_2d_theta_implicit_jfnk_vandb_picmi # name + 2 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d # inputs - Examples/Tests/implicit/analysis_1d.py # analysis - diags/diag1000100 # output + Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs + Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis + diags/diag1000020 # output ) diff --git a/Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d b/Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard similarity index 100% rename from Examples/Tests/implicit/inputs_1d_test_semi_implicit_picard_1d rename to Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard diff --git a/Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d b/Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard similarity index 100% rename from Examples/Tests/implicit/inputs_1d_test_theta_implicit_picard_1d rename to Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard diff --git a/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d b/Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb similarity index 100% rename from Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d rename to Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb diff --git a/Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py b/Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py similarity index 100% rename from Examples/Tests/implicit/inputs_2d_test_theta_implicit_jfnk_vandb_2d_picmi.py rename to Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index f143ca10268..1b71500b099 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# initial_distribution ######################################################## -# add_warpx_test( - initial_distribution # name + test_3d_initial_distribution # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution # inputs - Examples/Tests/initial_distribution/analysis_distribution.py # analysis + Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution # inputs + Examples/Tests/initial_distribution/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/initial_distribution/analysis_distribution.py b/Examples/Tests/initial_distribution/analysis.py similarity index 100% rename from Examples/Tests/initial_distribution/analysis_distribution.py rename to Examples/Tests/initial_distribution/analysis.py diff --git a/Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution b/Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution similarity index 100% rename from Examples/Tests/initial_distribution/inputs_3d_test_initial_distribution rename to Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index d3e402e967b..ce2467b1ae1 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# ion_stopping ################################################################ -# add_warpx_test( - ion_stopping # name + test_3d_ion_stopping # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping # inputs - Examples/Tests/ion_stopping/analysis_ion_stopping.py # analysis + Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping # inputs + Examples/Tests/ion_stopping/analysis.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/ion_stopping/analysis_ion_stopping.py b/Examples/Tests/ion_stopping/analysis.py similarity index 100% rename from Examples/Tests/ion_stopping/analysis_ion_stopping.py rename to Examples/Tests/ion_stopping/analysis.py diff --git a/Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping b/Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping similarity index 100% rename from Examples/Tests/ion_stopping/inputs_3d_test_ion_stopping rename to Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index bd0c096f327..e51727b8909 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# ionization_boost ############################################################ -# add_warpx_test( - ionization_boost # name + test_2d_ionization_boost # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_2d_test_ionization_boost # inputs - Examples/Tests/ionization/analysis_ionization.py # analysis + Examples/Tests/ionization/inputs_test_2d_ionization_boost # inputs + Examples/Tests/ionization/analysis.py # analysis diags/diag1000420 # output ) -# ionization_lab ############################################################## -# add_warpx_test( - ionization_lab # name + test_2d_ionization_lab # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_2d_test_ionization_lab # inputs - Examples/Tests/ionization/analysis_ionization.py # analysis + Examples/Tests/ionization/inputs_test_2d_ionization_lab # inputs + Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output ) -# ionization_picmi ############################################################## -# add_warpx_test( - ionization_picmi # name + test_2d_ionization_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py # inputs - Examples/Tests/ionization/analysis_ionization.py # analysis + Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py # inputs + Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output ) diff --git a/Examples/Tests/ionization/analysis_ionization.py b/Examples/Tests/ionization/analysis.py similarity index 100% rename from Examples/Tests/ionization/analysis_ionization.py rename to Examples/Tests/ionization/analysis.py diff --git a/Examples/Tests/ionization/inputs_2d_test_ionization_boost b/Examples/Tests/ionization/inputs_test_2d_ionization_boost similarity index 100% rename from Examples/Tests/ionization/inputs_2d_test_ionization_boost rename to Examples/Tests/ionization/inputs_test_2d_ionization_boost diff --git a/Examples/Tests/ionization/inputs_2d_test_ionization_lab b/Examples/Tests/ionization/inputs_test_2d_ionization_lab similarity index 100% rename from Examples/Tests/ionization/inputs_2d_test_ionization_lab rename to Examples/Tests/ionization/inputs_test_2d_ionization_lab diff --git a/Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py b/Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py similarity index 100% rename from Examples/Tests/ionization/inputs_2d_test_ionization_picmi.py rename to Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index f70ec0b2353..ee5081d9721 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -1,470 +1,400 @@ # Add tests (alphabetical order) ############################################## # -# langmuir_multi_1d ########################################################### -# add_warpx_test( - langmuir_multi_1d # name + test_1d_langmuir_multi # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d # inputs + Examples/Tests/langmuir/inputs_test_1d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output ) -# langmuir_multi_2d_mr ######################################################## -# add_warpx_test( - langmuir_multi_2d_mr # name + test_2d_langmuir_multi_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# langmuir_multi_2d_mr_anisotropic ############################################ -# add_warpx_test( - langmuir_multi_2d_mr_anisotropic # name + test_2d_langmuir_multi_mr_anisotropic # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# langmuir_multi_2d_mr_momentum_conserving #################################### -# add_warpx_test( - langmuir_multi_2d_mr_momentum_conserving # name + test_2d_langmuir_multi_mr_momentum_conserving # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# langmuir_multi_2d_mr_psatd ################################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_mr_psatd # name + test_2d_langmuir_multi_mr_psatd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_nodal ##################################################### -# add_warpx_test( - langmuir_multi_2d_nodal # name + test_2d_langmuir_multi_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) -# langmuir_multi_2d_picmi ##################################################### -# add_warpx_test( - langmuir_multi_2d_picmi # name + test_2d_langmuir_multi_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# langmuir_multi_2d_psatd ##################################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd # name + test_2d_langmuir_multi_psatd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_current_correction ################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_current_correction # name + test_2d_langmuir_multi_psatd_current_correction # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_current_correction_nodal ############################ -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_current_correction_nodal # name + test_2d_langmuir_multi_psatd_current_correction_nodal # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_momentum_conserving ################################# -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_momentum_conserving # name + test_2d_langmuir_multi_psatd_momentum_conserving # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_multiJ ############################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_multiJ # name + test_2d_langmuir_multi_psatd_multiJ # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_multiJ_nodal ######################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_multiJ_nodal # name + test_2d_langmuir_multi_psatd_multiJ_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_nodal ############################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_nodal # name + test_2d_langmuir_multi_psatd_nodal # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_2d_psatd_vay_deposition ###################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_vay_deposition # name + test_2d_langmuir_multi_psatd_vay_deposition # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() # FIXME -# langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 ##################### -# #if(WarpX_FFT) # add_warpx_test( -# langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 # name +# test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # name # 2 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 # inputs +# Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output # ) #endif() -# langmuir_multi_2d_psatd_vay_deposition_nodal ################################ -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_2d_psatd_vay_deposition_nodal # name + test_2d_langmuir_multi_psatd_vay_deposition_nodal # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal # inputs + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_3d ########################################################### -# add_warpx_test( - langmuir_multi_3d # name + test_3d_langmuir_multi # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) -# langmuir_multi_3d_nodal ##################################################### -# add_warpx_test( - langmuir_multi_3d_nodal # name + test_3d_langmuir_multi_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) -# langmuir_multi_3d_picmi ##################################################### -# add_warpx_test( - langmuir_multi_3d_picmi # name + test_3d_langmuir_multi_picmi # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# langmuir_multi_3d_psatd ##################################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd # name + test_3d_langmuir_multi_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_current_correction ################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_current_correction # name + test_3d_langmuir_multi_psatd_current_correction # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_current_correction_nodal ############################ -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_current_correction_nodal # name + test_3d_langmuir_multi_psatd_current_correction_nodal # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_div_cleaning ######################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_div_cleaning # name + test_3d_langmuir_multi_psatd_div_cleaning # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_momentum_conserving ################################# -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_momentum_conserving # name + test_3d_langmuir_multi_psatd_momentum_conserving # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_multiJ ############################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_multiJ # name + test_3d_langmuir_multi_psatd_multiJ # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_multiJ_nodal ######################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_multiJ_nodal # name + test_3d_langmuir_multi_psatd_multiJ_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_nodal ############################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_nodal # name + test_3d_langmuir_multi_psatd_nodal # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_vay_deposition ###################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_vay_deposition # name + test_3d_langmuir_multi_psatd_vay_deposition # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_3d_psatd_vay_deposition_nodal ################################ -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_3d_psatd_vay_deposition_nodal # name + test_3d_langmuir_multi_psatd_vay_deposition_nodal # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal # inputs + Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output ) endif() -# langmuir_multi_rz ########################################################### -# add_warpx_test( - langmuir_multi_rz # name + test_rz_langmuir_multi # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz # inputs + Examples/Tests/langmuir/inputs_test_rz_langmuir_multi # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) -# langmuir_multi_rz_picmi ##################################################### -# add_warpx_test( - langmuir_multi_rz_picmi # name + test_rz_langmuir_multi_picmi # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py # inputs + Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output ) -# langmuir_multi_rz_psatd ##################################################### -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_rz_psatd # name + test_rz_langmuir_multi_psatd # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd # inputs + Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_rz_psatd_current_correction ################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_rz_psatd_current_correction # name + test_rz_langmuir_multi_psatd_current_correction # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction # inputs + Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) endif() -# langmuir_multi_rz_psatd_multiJ ############################################## -# if(WarpX_FFT) add_warpx_test( - langmuir_multi_rz_psatd_multiJ # name + test_rz_langmuir_multi_psatd_multiJ # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ # inputs + Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d b/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d deleted file mode 100644 index 287576a9c7f..00000000000 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d +++ /dev/null @@ -1,2 +0,0 @@ -# base input parameters -FILE = inputs_3d_base diff --git a/Examples/Tests/langmuir/inputs_2d_base b/Examples/Tests/langmuir/inputs_base_2d similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_base rename to Examples/Tests/langmuir/inputs_base_2d diff --git a/Examples/Tests/langmuir/inputs_3d_base b/Examples/Tests/langmuir/inputs_base_3d similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_base rename to Examples/Tests/langmuir/inputs_base_3d diff --git a/Examples/Tests/langmuir/inputs_rz_base b/Examples/Tests/langmuir/inputs_base_rz similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_base rename to Examples/Tests/langmuir/inputs_base_rz diff --git a/Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d b/Examples/Tests/langmuir/inputs_test_1d_langmuir_multi similarity index 100% rename from Examples/Tests/langmuir/inputs_1d_test_langmuir_multi_1d rename to Examples/Tests/langmuir/inputs_test_1d_langmuir_multi diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr similarity index 92% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr index f1184d174dd..8adf73023be 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = ckc diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic index a1be1f4adb6..047943373c0 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_anisotropic +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = ckc diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving index 992a5d4d63c..201f19f32c2 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_momentum_conserving +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd similarity index 94% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd index d031fc0888b..cf95a07e2fc 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_mr_psatd +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal similarity index 89% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal index bbd7b19b07f..99d952d79d9 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_nodal +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_picmi.py rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd index d3ea795bc05..2386f9e462f 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction similarity index 94% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction index 0cfbfe7298e..c56572ac957 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = esirkepov diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal similarity index 94% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal index 246bd568b90..5359d8703f3 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_current_correction_nodal +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving similarity index 94% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving index 82828a8366c..694f65fe233 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_momentum_conserving +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ similarity index 92% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ index 030adef1842..793f077b0f7 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal index 780cea2a286..573337abb76 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_multiJ_nodal +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal similarity index 94% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal index d87d691e57f..8f02d4f8aae 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_nodal +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition index 73fffe5f307..209e48e10e6 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = vay diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal index 2a59bfd654d..d327c1b37b2 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_nodal +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = vay diff --git a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 similarity index 93% rename from Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 rename to Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 index d396d5eef2d..fc5d780cef1 100644 --- a/Examples/Tests/langmuir/inputs_2d_test_langmuir_multi_2d_psatd_vay_deposition_particle_shape_4 +++ b/Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.current_deposition = vay diff --git a/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi new file mode 100644 index 00000000000..7665a846eef --- /dev/null +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_base_3d diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal similarity index 83% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal index 15dd8645011..9620cd97f33 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_nodal +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_picmi.py rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd similarity index 83% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd index 01e3c64ebcb..427de2993b1 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction similarity index 92% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction index ee1e3790c39..86f33d131ce 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = esirkepov diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal similarity index 93% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal index ff3438a3605..7f67b9100b2 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_current_correction_nodal +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning similarity index 94% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning index ceffd849608..d372b789336 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_div_cleaning +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving similarity index 87% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving index f98b8025429..15a4c7d6985 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_momentum_conserving +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.field_gathering = momentum-conserving diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ similarity index 93% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ index fa113448b25..e1cd25cd93d 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal similarity index 94% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal index f33de387170..4a828d2e8b5 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_multiJ_nodal +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal similarity index 91% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal index 280ce13dbf1..fd03e00968a 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_nodal +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition similarity index 90% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition index 107089499c4..5e2ffa9d407 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = vay diff --git a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal similarity index 91% rename from Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal rename to Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal index 333a9b04266..df311b0fb3c 100644 --- a/Examples/Tests/langmuir/inputs_3d_test_langmuir_multi_3d_psatd_vay_deposition_nodal +++ b/Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.current_deposition = vay diff --git a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi similarity index 87% rename from Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz rename to Examples/Tests/langmuir/inputs_test_rz_langmuir_multi index 0c3807e5895..45665b67266 100644 --- a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz +++ b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters diag1.dump_rz_modes = 0 diff --git a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py similarity index 100% rename from Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_picmi.py rename to Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py diff --git a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd similarity index 94% rename from Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd rename to Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd index cbf6645574d..5537335629d 100644 --- a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd +++ b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction similarity index 95% rename from Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction rename to Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction index 6c6fde1be99..fac41cea4cd 100644 --- a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_current_correction +++ b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ similarity index 96% rename from Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ rename to Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ index a8bebdb1005..0ff617af8eb 100644 --- a/Examples/Tests/langmuir/inputs_rz_test_langmuir_multi_rz_psatd_multiJ +++ b/Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input parameters algo.current_deposition = direct diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index ecafa6d795d..74490f7a7ff 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -1,50 +1,42 @@ # Add tests (alphabetical order) ############################################## # -# langmuir_fluid_1d ########################################################### -# add_warpx_test( - langmuir_fluid_1d # name + test_1d_langmuir_fluid # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d # inputs + Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output ) -# langmuir_fluid_2d ########################################################### -# add_warpx_test( - langmuir_fluid_2d # name + test_2d_langmuir_fluid # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d # inputs + Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output ) -# langmuir_fluid_3d ########################################################### -# add_warpx_test( - langmuir_fluid_3d # name + test_3d_langmuir_fluid # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d # inputs + Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output ) -# langmuir_fluid_rz ########################################################### -# add_warpx_test( - langmuir_fluid_rz # name + test_rz_langmuir_fluid # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz # inputs + Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output ) diff --git a/Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d b/Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_1d_test_langmuir_fluid_1d rename to Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid diff --git a/Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d b/Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_2d_test_langmuir_fluid_2d rename to Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid diff --git a/Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d b/Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_3d_test_langmuir_fluid_3d rename to Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid diff --git a/Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz b/Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid similarity index 100% rename from Examples/Tests/langmuir_fluids/inputs_rz_test_langmuir_fluid_rz rename to Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index 4fe45fb1d19..b168fdd96c2 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# larmor ###################################################################### -# add_warpx_test( - larmor # name + test_2d_larmor # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/larmor/inputs_2d_test_larmor # inputs + Examples/Tests/larmor/inputs_test_2d_larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/larmor/inputs_2d_test_larmor b/Examples/Tests/larmor/inputs_test_2d_larmor similarity index 100% rename from Examples/Tests/larmor/inputs_2d_test_larmor rename to Examples/Tests/larmor/inputs_test_2d_larmor diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index 66850b74370..972a6aa9591 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# laser_injection_1d ########################################################## -# add_warpx_test( - laser_injection_1d # name + test_1d_laser_injection # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d # inputs + Examples/Tests/laser_injection/inputs_test_1d_laser_injection # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output ) -# laser_injection_2d ########################################################## -# add_warpx_test( - laser_injection_2d # name + test_2d_laser_injection # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d # inputs + Examples/Tests/laser_injection/inputs_test_2d_laser_injection # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output ) -# laser_injection_3d ########################################################## -# add_warpx_test( - laser_injection_3d # name + test_3d_laser_injection # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d # inputs + Examples/Tests/laser_injection/inputs_test_3d_laser_injection # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1000020 # output ) diff --git a/Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d b/Examples/Tests/laser_injection/inputs_test_1d_laser_injection similarity index 100% rename from Examples/Tests/laser_injection/inputs_1d_test_laser_injection_1d rename to Examples/Tests/laser_injection/inputs_test_1d_laser_injection diff --git a/Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d b/Examples/Tests/laser_injection/inputs_test_2d_laser_injection similarity index 100% rename from Examples/Tests/laser_injection/inputs_2d_test_laser_injection_2d rename to Examples/Tests/laser_injection/inputs_test_2d_laser_injection diff --git a/Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d b/Examples/Tests/laser_injection/inputs_test_3d_laser_injection similarity index 100% rename from Examples/Tests/laser_injection/inputs_3d_test_laser_injection_3d rename to Examples/Tests/laser_injection/inputs_test_3d_laser_injection diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 48ddd099606..c4a11ec34bf 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -2,92 +2,78 @@ # # FIXME -# laser_injection_from_binary_file ############################################ -# #add_warpx_test( -# laser_injection_from_binary_file # name +# test_2d_laser_injection_from_binary_file # name # 2 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_lasy_file_1d ########################################### -# #add_warpx_test( -# laser_injection_from_lasy_file_1d # name +# test_1d_laser_injection_from_lasy_file # name # 1 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_lasy_file_1d_boost ##################################### -# #add_warpx_test( -# laser_injection_from_lasy_file_1d_boost # name +# test_1d_laser_injection_from_lasy_file_boost # name # 1 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs # Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_lasy_file_2d ########################################### -# #add_warpx_test( -# laser_injection_from_lasy_file_2d # name +# test_2d_laser_injection_from_lasy_file # name # 2 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_lasy_file_3d ########################################### -# #add_warpx_test( -# laser_injection_from_lasy_file_3d # name +# test_3d_laser_injection_from_lasy_file # name # 3 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_lasy_file_rz ########################################### -# #add_warpx_test( -# laser_injection_from_lasy_file_rz # name +# test_rz_laser_injection_from_lasy_file # name # RZ # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis # diags/diag1000250 # output #) # FIXME -# laser_injection_from_rz_lasy_file ########################################### -# #add_warpx_test( -# laser_injection_from_rz_lasy_file # name +# test_rz_laser_injection_from_RZ_lasy_file # name # RZ # dims # 1 # nprocs # OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file # inputs +# Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis # diags/diag1000250 # output #) diff --git a/Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d rename to Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file diff --git a/Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_1d_test_laser_injection_from_lasy_file_1d_boost rename to Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost diff --git a/Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_binary_file rename to Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file diff --git a/Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_2d_test_laser_injection_from_lasy_file_2d rename to Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file diff --git a/Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_3d_test_laser_injection_from_lasy_file_3d rename to Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file diff --git a/Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_rz_lasy_file rename to Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file diff --git a/Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file similarity index 100% rename from Examples/Tests/laser_injection_from_file/inputs_rz_test_laser_injection_from_lasy_file_rz rename to Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index 1b20867fb31..e40b0c6aff3 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# laser_on_fine ############################################################### -# add_warpx_test( - laser_on_fine # name + test_2d_laser_on_fine # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine # inputs + Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output ) diff --git a/Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine b/Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine similarity index 100% rename from Examples/Tests/laser_on_fine/inputs_2d_test_laser_on_fine rename to Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 68e58e369a4..cb9e34d6348 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -1,74 +1,62 @@ # Add tests (alphabetical order) ############################################## # -# load_external_field_3d_grid_picmi ########################################### -# add_warpx_test( - load_external_field_3d_grid_picmi # name + test_3d_load_external_field_grid_picmi # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py # inputs + Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output ) -# load_external_field_3d_particle_picmi ####################################### -# add_warpx_test( - load_external_field_3d_particle_picmi # name + test_3d_load_external_field_particle_picmi # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py # inputs + Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output ) -# load_external_field_rz_grid ################################################# -# add_warpx_test( - load_external_field_rz_grid # name + test_rz_load_external_field_grid # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid # inputs + Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output ) -# load_external_field_rz_grid_restart ######################################### -# add_warpx_test( - load_external_field_rz_grid_restart # name + test_rz_load_external_field_grid_restart # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart # inputs + Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output ) -# load_external_field_rz_particles ############################################ -# add_warpx_test( - load_external_field_rz_particles # name + test_rz_load_external_field_particles # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles # inputs + Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output ) -# load_external_field_rz_particles_restart #################################### -# add_warpx_test( - load_external_field_rz_particles_restart # name + test_rz_load_external_field_particles_restart # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart # inputs + Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output ) diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart deleted file mode 100644 index 2c9a97156e0..00000000000 --- a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_rz_test_load_external_field_rz_grid - -# test input parameters -amr.restart = ../load_external_field_rz_grid/diags/chk000150 diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart b/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart deleted file mode 100644 index 59adefc23d6..00000000000 --- a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_rz_test_load_external_field_rz_particles - -# test input parameters -amr.restart = ../load_external_field_rz_particles/diags/chk000150 diff --git a/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py b/Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py similarity index 100% rename from Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_grid_picmi.py rename to Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py diff --git a/Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py b/Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py similarity index 100% rename from Examples/Tests/load_external_field/inputs_3d_test_load_external_field_3d_particle_picmi.py rename to Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid similarity index 100% rename from Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_grid rename to Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid diff --git a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart new file mode 100644 index 00000000000..72c668141b7 --- /dev/null +++ b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_rz_load_external_field_grid + +# test input parameters +amr.restart = ../test_rz_load_external_field_grid/diags/chk000150 diff --git a/Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles similarity index 100% rename from Examples/Tests/load_external_field/inputs_rz_test_load_external_field_rz_particles rename to Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles diff --git a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart new file mode 100644 index 00000000000..3c2cc51d53f --- /dev/null +++ b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_rz_load_external_field_particles + +# test input parameters +amr.restart = ../test_rz_load_external_field_particles/diags/chk000150 diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index 683e3b98fd4..ec583210aff 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -1,43 +1,37 @@ # Add tests (alphabetical order) ############################################## # -# magnetostatic_eb_3d ######################################################### -# if(WarpX_EB) add_warpx_test( - magnetostatic_eb_3d # name + test_3d_magnetostatic_eb # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d # inputs + Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output ) endif() -# magnetostatic_eb_3d_picmi ################################################### -# if(WarpX_EB) add_warpx_test( - magnetostatic_eb_3d_picmi # name + test_3d_magnetostatic_eb_picmi # name 3 # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py # inputs + Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output ) endif() -# magnetostatic_eb_rz_picmi ################################################### -# if(WarpX_EB) add_warpx_test( - magnetostatic_eb_rz_picmi # name + test_rz_magnetostatic_eb_picmi # name RZ # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py # inputs + Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py # inputs Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d b/Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb similarity index 100% rename from Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d rename to Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb diff --git a/Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py b/Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py similarity index 100% rename from Examples/Tests/magnetostatic_eb/inputs_3d_test_magnetostatic_eb_3d_picmi.py rename to Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py diff --git a/Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py b/Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py similarity index 100% rename from Examples/Tests/magnetostatic_eb/inputs_rz_test_magnetostatic_eb_rz_picmi.py rename to Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index e09159c07e7..b3b0716b18f 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# maxwell_hybrid_qed_solver ################################################### -# if(WarpX_FFT) add_warpx_test( - maxwell_hybrid_qed_solver # name + test_2d_maxwell_hybrid_qed_solver # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver # inputs + Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver # inputs Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output ) diff --git a/Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver b/Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver similarity index 100% rename from Examples/Tests/maxwell_hybrid_qed/inputs_2d_test_maxwell_hybrid_qed_solver rename to Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index 05be97853df..8cb6e07e7d8 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# nci_corrector ############################################################### -# add_warpx_test( - nci_corrector # name + test_2d_nci_corrector # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector # inputs + Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output ) -# nci_corrector_mr ############################################################ -# add_warpx_test( - nci_corrector_mr # name + test_2d_nci_corrector_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr # inputs + Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output ) diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d_base b/Examples/Tests/nci_fdtd_stability/inputs_base_2d similarity index 100% rename from Examples/Tests/nci_fdtd_stability/inputs_2d_base rename to Examples/Tests/nci_fdtd_stability/inputs_base_2d diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector b/Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector similarity index 81% rename from Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector rename to Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector index 5c25ec4d56a..83d537fd856 100644 --- a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector +++ b/Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters amr.max_level = 0 diff --git a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr b/Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr similarity index 89% rename from Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr rename to Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr index a9be762449e..0f53af0443a 100644 --- a/Examples/Tests/nci_fdtd_stability/inputs_2d_test_nci_corrector_mr +++ b/Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters amr.max_level = 1 diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 13bdc51cb41..fb4feee7beb 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -1,239 +1,205 @@ # Add tests (alphabetical order) ############################################## # -# averaged_galilean_2d_psatd ################################################## -# if(WarpX_FFT) add_warpx_test( - averaged_galilean_2d_psatd # name + test_2d_averaged_galilean_psatd # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# averaged_galilean_2d_psatd_hybrid ########################################### -# if(WarpX_FFT) add_warpx_test( - averaged_galilean_2d_psatd_hybrid # name + test_2d_averaged_galilean_psatd_hybrid # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# averaged_galilean_3d_psatd ################################################## -# if(WarpX_FFT) add_warpx_test( - averaged_galilean_3d_psatd # name + test_3d_averaged_galilean_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output ) endif() -# averaged_galilean_3d_psatd_hybrid ########################################### -# if(WarpX_FFT) add_warpx_test( - averaged_galilean_3d_psatd_hybrid # name + test_3d_averaged_galilean_psatd_hybrid # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output ) endif() -# comoving_2d_psatd_hybrid #################################################### -# if(WarpX_FFT) add_warpx_test( - comoving_2d_psatd_hybrid # name + test_2d_comoving_psatd_hybrid # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output ) endif() -# galilean_2d_psatd ########################################################### -# if(WarpX_FFT) add_warpx_test( - galilean_2d_psatd # name + test_2d_galilean_psatd # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# galilean_2d_psatd_current_correction ######################################## -# if(WarpX_FFT) add_warpx_test( - galilean_2d_psatd_current_correction # name + test_2d_galilean_psatd_current_correction # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# galilean_2d_psatd_current_correction_psb #################################### -# if(WarpX_FFT) add_warpx_test( - galilean_2d_psatd_current_correction_psb # name + test_2d_galilean_psatd_current_correction_psb # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# galilean_2d_psatd_hybrid #################################################### -# if(WarpX_FFT) add_warpx_test( - galilean_2d_psatd_hybrid # name + test_2d_galilean_psatd_hybrid # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid # inputs + Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output ) endif() -# galilean_3d_psatd ########################################################### -# if(WarpX_FFT) add_warpx_test( - galilean_3d_psatd # name + test_3d_galilean_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output ) endif() -# galilean_3d_psatd_current_correction ######################################## -# if(WarpX_FFT) add_warpx_test( - galilean_3d_psatd_current_correction # name + test_3d_galilean_psatd_current_correction # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output ) endif() -# galilean_3d_psatd_current_correction_psb #################################### -# if(WarpX_FFT) add_warpx_test( - galilean_3d_psatd_current_correction_psb # name + test_3d_galilean_psatd_current_correction_psb # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output ) endif() -# galilean_rz_psatd ########################################################### -# if(WarpX_FFT) add_warpx_test( - galilean_rz_psatd # name + test_rz_galilean_psatd # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# galilean_rz_psatd_current_correction ######################################## -# if(WarpX_FFT) add_warpx_test( - galilean_rz_psatd_current_correction # name + test_rz_galilean_psatd_current_correction # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction # inputs + Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# galilean_rz_psatd_current_correction_psb #################################### -# if(WarpX_FFT) add_warpx_test( - galilean_rz_psatd_current_correction_psb # name + test_rz_galilean_psatd_current_correction_psb # name RZ # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb # inputs + Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output ) endif() -# multi_J_rz_psatd #################################### -# if(WarpX_FFT) add_warpx_test( - multi_J_rz_psatd # name + test_rz_multiJ_psatd # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd # inputs + Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output ) endif() -# uniform_plasma_multiJ ####################################################### -# if(WarpX_FFT) add_warpx_test( - uniform_plasma_multiJ # name + test_3d_uniform_plasma_multiJ # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ # inputs + Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ # inputs Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis diags/diag1000300 # output ) diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_base b/Examples/Tests/nci_psatd_stability/inputs_base_2d similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_2d_base rename to Examples/Tests/nci_psatd_stability/inputs_base_2d diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_base b/Examples/Tests/nci_psatd_stability/inputs_base_2d_averaged similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_avg_2d_base rename to Examples/Tests/nci_psatd_stability/inputs_base_2d_averaged diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_base b/Examples/Tests/nci_psatd_stability/inputs_base_3d similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_3d_base rename to Examples/Tests/nci_psatd_stability/inputs_base_3d diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_base b/Examples/Tests/nci_psatd_stability/inputs_base_3d_averaged similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_avg_3d_base rename to Examples/Tests/nci_psatd_stability/inputs_base_3d_averaged diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_base b/Examples/Tests/nci_psatd_stability/inputs_base_rz similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_rz_base rename to Examples/Tests/nci_psatd_stability/inputs_base_rz diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd similarity index 79% rename from Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd index 61f402ae39e..62f93dbd473 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_avg_3d_base +FILE = inputs_base_2d_averaged # test input parameters psatd.current_correction = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid similarity index 86% rename from Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid index 9af90cd7fad..0ef3668b103 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_avg_2d_base +FILE = inputs_base_2d_averaged # test input parameters amr.max_grid_size_x = 128 diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_2d_test_comoving_2d_psatd_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd similarity index 89% rename from Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd index df434fb2a32..caebf987434 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input paramters algo.current_deposition = direct diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction similarity index 91% rename from Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction index 421115ec98e..177cf7bcd0c 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction +++ b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input paramters amr.blocking_factor = 64 diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb similarity index 89% rename from Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb index bd6572763a8..437059d6bd8 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_current_correction_psb +++ b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input paramters diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE diff --git a/Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_2d_test_galilean_2d_psatd_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd similarity index 79% rename from Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd index e3fa05446b3..7c978874145 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_2d_test_averaged_galilean_2d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_avg_2d_base +FILE = inputs_base_3d_averaged # test input parameters psatd.current_correction = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid b/Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid similarity index 82% rename from Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid index fc13885a46c..4996f476854 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_avg_3d_test_averaged_galilean_3d_psatd_hybrid +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_avg_3d_base +FILE = inputs_base_3d_averaged # test input parameters psatd.current_correction = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd similarity index 88% rename from Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd index f685af7600c..3ec82981aea 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters psatd.current_correction = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction similarity index 92% rename from Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction index 6b584f25ba2..8b596c9a633 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb similarity index 92% rename from Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb index 9674ce6734e..87ce1b7ed92 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_3d_test_galilean_3d_psatd_current_correction_psb +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters diag1.fields_to_plot = Ex Ey Ez Bx By Bz jx jy jz rho divE diff --git a/Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ similarity index 94% rename from Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ rename to Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ index 41778983f47..70e9c5e992c 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_3d_test_uniform_plasma_multiJ +++ b/Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters diag1.fields_to_plot = Bx By Bz divE Ex Ey Ez F G jx jy jz rho diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd similarity index 88% rename from Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd index 46564313045..30bcfc160cf 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd +++ b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input paramters electrons.random_theta = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction similarity index 90% rename from Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction rename to Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction index 29018865cae..378535e12bc 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction +++ b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input paramters amr.blocking_factor = 32 diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb similarity index 87% rename from Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb rename to Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb index 3ba3503686a..6eb35754a90 100644 --- a/Examples/Tests/nci_psatd_stability/inputs_rz_test_galilean_rz_psatd_current_correction_psb +++ b/Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_rz_base +FILE = inputs_base_rz # test input paramters electrons.random_theta = 0 diff --git a/Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd b/Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd similarity index 100% rename from Examples/Tests/nci_psatd_stability/inputs_rz_test_multi_J_rz_psatd rename to Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 924661033a9..66c18503aed 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# nodal_electrostatic_solver ################################################## -# add_warpx_test( - nodal_electrostatic_solver # name + test_3d_nodal_electrostatic_solver # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver # inputs - Examples/Tests/nodal_electrostatic/analysis_3d.py # analysis + Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver # inputs + Examples/Tests/nodal_electrostatic/analysis.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/nodal_electrostatic/analysis_3d.py b/Examples/Tests/nodal_electrostatic/analysis.py similarity index 100% rename from Examples/Tests/nodal_electrostatic/analysis_3d.py rename to Examples/Tests/nodal_electrostatic/analysis.py diff --git a/Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver b/Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver similarity index 100% rename from Examples/Tests/nodal_electrostatic/inputs_3d_test_nodal_electrostatic_solver rename to Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 1ec8f4c3cb9..3883eb6b9da 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -1,74 +1,62 @@ # Add tests (alphabetical order) ############################################## # -# deuterium_deuterium_fusion_3d ############################################### -# add_warpx_test( - deuterium_deuterium_fusion_3d # name + test_3d_deuterium_deuterium_fusion # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d # inputs + Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# deuterium_deuterium_fusion_3d_intraspecies ################################## -# add_warpx_test( - deuterium_deuterium_fusion_3d_intraspecies # name + test_3d_deuterium_deuterium_fusion_intraspecies # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies # inputs + Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output ) -# deuterium_tritium_fusion_3d ################################################# -# add_warpx_test( - deuterium_tritium_fusion_3d # name + test_3d_deuterium_tritium_fusion # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d # inputs + Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# deuterium_tritium_fusion_rz ################################################# -# add_warpx_test( - deuterium_tritium_fusion_rz # name + test_rz_deuterium_tritium_fusion # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz # inputs + Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output ) -# proton_boron_fusion_2d ###################################################### -# add_warpx_test( - proton_boron_fusion_2d # name + test_2d_proton_boron_fusion # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d # inputs + Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output ) -# proton_boron_fusion_3d ###################################################### -# add_warpx_test( - proton_boron_fusion_3d # name + test_3d_proton_boron_fusion # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d # inputs + Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d b/Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_2d_test_proton_boron_fusion_2d rename to Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d b/Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d rename to Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies b/Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_deuterium_fusion_3d_intraspecies rename to Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d b/Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_deuterium_tritium_fusion_3d rename to Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion diff --git a/Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d b/Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_3d_test_proton_boron_fusion_3d rename to Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion diff --git a/Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz b/Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion similarity index 100% rename from Examples/Tests/nuclear_fusion/inputs_rz_test_deuterium_tritium_fusion_rz rename to Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index 548563b8632..3aea0d29009 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -2,28 +2,24 @@ # # FIXME -# ohm_solver_em_modes_1d_picmi ################################################ -# #add_warpx_test( -# ohm_solver_em_modes_1d_picmi # name +# test_1d_ohm_solver_em_modes_picmi # name # 1 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py # inputs +# Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py # inputs # Examples/Tests/ohm_solver_em_modes/analysis.py # analysis # diags/field_diag000250 # output # "--test --dim 1 --bdir z" # optional command-line arguments #) # FIXME -# ohm_solver_em_modes_rz_picmi ################################################ -# #add_warpx_test( -# ohm_solver_em_modes_rz_picmi # name +# test_rz_ohm_solver_em_modes_picmi # name # RZ # dims # 2 # nprocs # OFF # eb -# Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py # inputs +# Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py # inputs # Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis # diags/diag1000100 # output # "--test" # optional command-line arguments diff --git a/Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py b/Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py similarity index 100% rename from Examples/Tests/ohm_solver_em_modes/inputs_1d_test_ohm_solver_em_modes_1d_picmi.py rename to Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py diff --git a/Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py b/Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py similarity index 100% rename from Examples/Tests/ohm_solver_em_modes/inputs_rz_test_ohm_solver_em_modes_rz_picmi.py rename to Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index 8b70cf98fe0..024e4bd09c3 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# open_bc_poisson_solver ###################################################### -# if(WarpX_FFT) add_warpx_test( - open_bc_poisson_solver # name + test_3d_open_bc_poisson_solver # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver # inputs + Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver b/Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver similarity index 100% rename from Examples/Tests/open_bc_poisson_solver/inputs_3d_test_open_bc_poisson_solver rename to Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index 2af5675a547..c6ddf107a0d 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# particle_boundary_interaction_picmi ######################################### -# if(WarpX_EB) add_warpx_test( - particle_boundary_interaction_picmi # name + test_rz_particle_boundary_interaction_picmi # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py # inputs + Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis diags/diag1/ # output ) diff --git a/Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py b/Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py similarity index 100% rename from Examples/Tests/particle_boundary_interaction/inputs_rz_test_particle_boundary_interaction_picmi.py rename to Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index 89bc251bd9a..c4ee9a96b1d 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -1,28 +1,24 @@ # Add tests (alphabetical order) ############################################## # -# particle_absorption ######################################################### -# if(WarpX_EB) add_warpx_test( - particle_absorption # name + test_3d_particle_absorption # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption # inputs + Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption # inputs Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis diags/diag1000060 # output ) endif() -# particle_reflection_picmi ################################################### -# add_warpx_test( - particle_reflection_picmi # name + test_2d_particle_reflection_picmi # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py # inputs + Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py # inputs Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py b/Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py similarity index 100% rename from Examples/Tests/particle_boundary_process/inputs_2d_test_particle_reflection_picmi.py rename to Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py diff --git a/Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption b/Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption similarity index 100% rename from Examples/Tests/particle_boundary_process/inputs_3d_test_particle_absorption rename to Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 6ba73530942..083b597703c 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -1,29 +1,25 @@ # Add tests (alphabetical order) ############################################## # -# particle_scrape ############################################################# -# if(WarpX_EB) add_warpx_test( - particle_scrape # name + test_3d_particle_scrape # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape # inputs + Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output ) endif() -# particle_scrape_picmi ####################################################### -# if(WarpX_EB) add_warpx_test( - particle_scrape_picmi # name + test_3d_particle_scrape_picmi # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py # inputs + Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output ) diff --git a/Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape b/Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape similarity index 100% rename from Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape rename to Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape diff --git a/Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py b/Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py similarity index 100% rename from Examples/Tests/particle_boundary_scrape/inputs_3d_test_particle_scrape_picmi.py rename to Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index f9009dfb524..c8b7d15031b 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -1,39 +1,33 @@ # Add tests (alphabetical order) ############################################## # -# prev_positions_picmi ######################################################## -# add_warpx_test( - prev_positions_picmi # name + test_2d_prev_positions_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py # inputs + Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# particle_attr_access_picmi ################################################## -# add_warpx_test( - particle_attr_access_picmi # name + test_2d_particle_attr_access_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs + Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs Examples/Tests/particle_data_python/analysis.py # analysis diags/diag1000010 # output ) # FIXME -# particle_attr_access_unique_picmi ################################################## -# #add_warpx_test( -# particle_attr_access_unique_picmi # name +# test_2d_particle_attr_access_unique_picmi # name # 2 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py # inputs +# Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs # Examples/Tests/particle_data_python/analysis.py # analysis # diags/diag1000010 # output #) diff --git a/Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py b/Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py similarity index 100% rename from Examples/Tests/particle_data_python/inputs_2d_test_particle_attr_access_picmi.py rename to Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py diff --git a/Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py b/Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py similarity index 100% rename from Examples/Tests/particle_data_python/inputs_2d_test_prev_positions_picmi.py rename to Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 0c7bdf77d0d..9e0c4508560 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -1,27 +1,23 @@ # Add tests (alphabetical order) ############################################## # -# particle_fields_diags ####################################################### -# add_warpx_test( - particle_fields_diags # name + test_3d_particle_fields_diags # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags # inputs + Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis diags/diag1000200 # output ) # FIXME -# particle_fields_diags_single_precision ###################################### -# #add_warpx_test( -# particle_fields_diags_single_precision # name +# test_3d_particle_fields_diags_single_precision # name # 3 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags_single_precision # inputs +# Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags_single_precision # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output #) diff --git a/Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags b/Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags similarity index 100% rename from Examples/Tests/particle_fields_diags/inputs_3d_test_particle_fields_diags rename to Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index 570f7b6563a..6ebde2d60bd 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# particle_pusher ############################################################# -# add_warpx_test( - particle_pusher # name + test_3d_particle_pusher # name 3 # dims 1 # nprocs OFF # eb - Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher # inputs - Examples/Tests/particle_pusher/analysis_pusher.py # analysis + Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher # inputs + Examples/Tests/particle_pusher/analysis.py # analysis diags/diag1010000 # output ) diff --git a/Examples/Tests/particle_pusher/analysis_pusher.py b/Examples/Tests/particle_pusher/analysis.py similarity index 100% rename from Examples/Tests/particle_pusher/analysis_pusher.py rename to Examples/Tests/particle_pusher/analysis.py diff --git a/Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher b/Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher similarity index 100% rename from Examples/Tests/particle_pusher/inputs_3d_test_particle_pusher rename to Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index c3e58bf04d4..d89d585701b 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# particle_thermal_boundary ################################################### -# add_warpx_test( - particle_thermal_boundary # name + test_2d_particle_thermal_boundary # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary # inputs - Examples/Tests/particle_thermal_boundary/analysis_2d.py # analysis + Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary # inputs + Examples/Tests/particle_thermal_boundary/analysis.py # analysis diags/diag1002000 # output ) diff --git a/Examples/Tests/particle_thermal_boundary/analysis_2d.py b/Examples/Tests/particle_thermal_boundary/analysis.py similarity index 100% rename from Examples/Tests/particle_thermal_boundary/analysis_2d.py rename to Examples/Tests/particle_thermal_boundary/analysis.py diff --git a/Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary b/Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary similarity index 100% rename from Examples/Tests/particle_thermal_boundary/inputs_2d_test_particle_thermal_boundary rename to Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index 9deb14e5d7e..dcbb5bb3d9b 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -1,50 +1,42 @@ # Add tests (alphabetical order) ############################################## # -# particles_in_pml_2d ######################################################### -# add_warpx_test( - particles_in_pml_2d # name + test_2d_particles_in_pml # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d # inputs + Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000180 # output ) -# particles_in_pml_2d_mr ###################################################### -# add_warpx_test( - particles_in_pml_2d_mr # name + test_2d_particles_in_pml_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr # inputs + Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000300 # output ) -# particles_in_pml_3d ######################################################### -# add_warpx_test( - particles_in_pml_3d # name + test_3d_particles_in_pml # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d # inputs + Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000120 # output ) -# particles_in_pml_3d_mr ###################################################### -# add_warpx_test( - particles_in_pml_3d_mr # name + test_3d_particles_in_pml_mr # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr # inputs + Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000200 # output ) diff --git a/Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d b/Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d rename to Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml diff --git a/Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr b/Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_2d_test_particles_in_pml_2d_mr rename to Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr diff --git a/Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d b/Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d rename to Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml diff --git a/Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr b/Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr similarity index 100% rename from Examples/Tests/particles_in_pml/inputs_3d_test_particles_in_pml_3d_mr rename to Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index ede6abb528e..72780916f2e 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -2,14 +2,12 @@ # # FIXME -# pass_mpi_comm_picmi ######################################################### -# #add_warpx_test( -# pass_mpi_comm_picmi # name +# test_2d_pass_mpi_comm_picmi # name # 2 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py # inputs +# Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs # Examples/Tests/pass_mpi_communicator/analysis.py # analysis # diags/diag1000010 # output #) diff --git a/Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py b/Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py similarity index 100% rename from Examples/Tests/pass_mpi_communicator/inputs_2d_test_pass_mpi_comm_picmi.py rename to Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index 5a6064ff935..3e16d6300f3 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# pec_field ################################################################### -# add_warpx_test( - pec_field # name + test_3d_pec_field # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_3d_test_pec_field # inputs + Examples/Tests/pec/inputs_test_3d_pec_field # inputs Examples/Tests/pec/analysis_pec.py # analysis diags/diag1000125 # output ) -# pec_field_mr ################################################################ -# add_warpx_test( - pec_field_mr # name + test_3d_pec_field_mr # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_3d_test_pec_field_mr # inputs + Examples/Tests/pec/inputs_test_3d_pec_field_mr # inputs Examples/Tests/pec/analysis_pec_mr.py # analysis diags/diag1000125 # output ) -# pec_particle ################################################################ -# add_warpx_test( - pec_particle # name + test_3d_pec_particle # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_3d_test_pec_particle # inputs + Examples/Tests/pec/inputs_test_3d_pec_particle # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output ) diff --git a/Examples/Tests/pec/inputs_3d_test_pec_field b/Examples/Tests/pec/inputs_test_3d_pec_field similarity index 100% rename from Examples/Tests/pec/inputs_3d_test_pec_field rename to Examples/Tests/pec/inputs_test_3d_pec_field diff --git a/Examples/Tests/pec/inputs_3d_test_pec_field_mr b/Examples/Tests/pec/inputs_test_3d_pec_field_mr similarity index 100% rename from Examples/Tests/pec/inputs_3d_test_pec_field_mr rename to Examples/Tests/pec/inputs_test_3d_pec_field_mr diff --git a/Examples/Tests/pec/inputs_3d_test_pec_particle b/Examples/Tests/pec/inputs_test_3d_pec_particle similarity index 100% rename from Examples/Tests/pec/inputs_3d_test_pec_particle rename to Examples/Tests/pec/inputs_test_3d_pec_particle diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index 0557ca94865..af523dfa70c 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# photon_pusher ############################################################### -# add_warpx_test( - photon_pusher # name + test_3d_photon_pusher # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher # inputs - Examples/Tests/photon_pusher/analysis_photon_pusher.py # analysis + Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher # inputs + Examples/Tests/photon_pusher/analysis.py # analysis diags/diag1000050 # output ) diff --git a/Examples/Tests/photon_pusher/analysis_photon_pusher.py b/Examples/Tests/photon_pusher/analysis.py similarity index 100% rename from Examples/Tests/photon_pusher/analysis_photon_pusher.py rename to Examples/Tests/photon_pusher/analysis.py diff --git a/Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher b/Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher similarity index 100% rename from Examples/Tests/photon_pusher/inputs_3d_test_photon_pusher rename to Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index d5c470df371..aa032641d52 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -1,62 +1,52 @@ # Add tests (alphabetical order) ############################################## # -# plasma_lens ################################################################# -# add_warpx_test( - plasma_lens # name + test_3d_plasma_lens # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens # inputs + Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output ) -# plasma_lens_boosted ######################################################### -# add_warpx_test( - plasma_lens_boosted # name + test_3d_plasma_lens_boosted # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted # inputs + Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output ) -# plasma_lens_hard_edged ###################################################### -# add_warpx_test( - plasma_lens_hard_edged # name + test_3d_plasma_lens_hard_edged # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged # inputs + Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output ) -# plasma_lens_picmi ########################################################### -# add_warpx_test( - plasma_lens_picmi # name + test_3d_plasma_lens_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py # inputs + Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output ) -# plasma_lens_short ########################################################### -# add_warpx_test( - plasma_lens_short # name + test_3d_plasma_lens_short # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short # inputs + Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output ) diff --git a/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens b/Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens rename to Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens diff --git a/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted b/Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_boosted rename to Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted diff --git a/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged b/Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_hard_edged rename to Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged diff --git a/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py b/Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_picmi.py rename to Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py diff --git a/Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short b/Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short similarity index 100% rename from Examples/Tests/plasma_lens/inputs_3d_test_plasma_lens_short rename to Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index a35945c0218..d27d7cd0be7 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -1,102 +1,86 @@ # Add tests (alphabetical order) ############################################## # -# pml_psatd_dive_divb_cleaning ################################################ -# if(WarpX_FFT) add_warpx_test( - pml_psatd_dive_divb_cleaning # name + test_3d_pml_psatd_dive_divb_cleaning # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning # inputs + Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) endif() -# pml_psatd_rz ################################################################ -# if(WarpX_FFT) add_warpx_test( - pml_psatd_rz # name + test_rz_pml_psatd # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_rz_test_pml_psatd_rz # inputs + Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output ) endif() -# pml_x_ckc ################################################################### -# add_warpx_test( - pml_x_ckc # name + test_2d_pml_x_ckc # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_ckc # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_ckc # inputs Examples/Tests/pml/analysis_pml_ckc.py # analysis diags/diag1000300 # output ) -# pml_x_galilean ############################################################## -# add_warpx_test( - pml_x_galilean # name + test_2d_pml_x_galilean # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_galilean # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_galilean # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output ) -# pml_x_psatd ################################################################# -# add_warpx_test( - pml_x_psatd # name + test_2d_pml_x_psatd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_psatd # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_psatd # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output ) -# pml_x_psatd_restart ######################################################### -# add_warpx_test( - pml_x_psatd_restart # name + test_2d_pml_x_psatd_restart # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output ) -# pml_x_yee ################################################################### -# add_warpx_test( - pml_x_yee # name + test_2d_pml_x_yee # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_yee # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_yee # inputs Examples/Tests/pml/analysis_pml_yee.py # analysis diags/diag1000300 # output ) -# pml_x_yee_restart ########################################################### -# add_warpx_test( - pml_x_yee_restart # name + test_2d_pml_x_yee_restart # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart # inputs + Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output ) diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart b/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart deleted file mode 100644 index cadbbdb898c..00000000000 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_2d_test_pml_x_psatd - -# test input parameters -amr.restart = ../pml_x_psatd/diags/chk000150 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart b/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart deleted file mode 100644 index e7a5794e52e..00000000000 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_yee_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_2d_test_pml_x_yee - -# test input parameters -amr.restart = ../pml_x_yee/diags/chk000150 diff --git a/Examples/Tests/pml/inputs_2d_base b/Examples/Tests/pml/inputs_base_2d similarity index 100% rename from Examples/Tests/pml/inputs_2d_base rename to Examples/Tests/pml/inputs_base_2d diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_ckc b/Examples/Tests/pml/inputs_test_2d_pml_x_ckc similarity index 77% rename from Examples/Tests/pml/inputs_2d_test_pml_x_ckc rename to Examples/Tests/pml/inputs_test_2d_pml_x_ckc index 16d924e6697..f686674ae14 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_ckc +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_ckc @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = ckc diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_galilean b/Examples/Tests/pml/inputs_test_2d_pml_x_galilean similarity index 94% rename from Examples/Tests/pml/inputs_2d_test_pml_x_galilean rename to Examples/Tests/pml/inputs_test_2d_pml_x_galilean index 023a080498e..34a9081a181 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_galilean +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_galilean @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd similarity index 93% rename from Examples/Tests/pml/inputs_2d_test_pml_x_psatd rename to Examples/Tests/pml/inputs_test_2d_pml_x_psatd index da8ab3a3a02..191d5774530 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_psatd +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart new file mode 100644 index 00000000000..4e0f283ca37 --- /dev/null +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_2d_pml_x_psatd + +# test input parameters +amr.restart = ../test_2d_pml_x_psatd/diags/chk000150 diff --git a/Examples/Tests/pml/inputs_2d_test_pml_x_yee b/Examples/Tests/pml/inputs_test_2d_pml_x_yee similarity index 77% rename from Examples/Tests/pml/inputs_2d_test_pml_x_yee rename to Examples/Tests/pml/inputs_test_2d_pml_x_yee index c33b3886a36..390cf079c16 100644 --- a/Examples/Tests/pml/inputs_2d_test_pml_x_yee +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_yee @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base +FILE = inputs_base_2d # test input parameters algo.maxwell_solver = yee diff --git a/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart b/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart new file mode 100644 index 00000000000..12579ada053 --- /dev/null +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_2d_pml_x_yee + +# test input parameters +amr.restart = ../test_2d_pml_x_yee/diags/chk000150 diff --git a/Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning b/Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning similarity index 100% rename from Examples/Tests/pml/inputs_3d_test_pml_psatd_dive_divb_cleaning rename to Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning diff --git a/Examples/Tests/pml/inputs_rz_test_pml_psatd_rz b/Examples/Tests/pml/inputs_test_rz_pml_psatd similarity index 100% rename from Examples/Tests/pml/inputs_rz_test_pml_psatd_rz rename to Examples/Tests/pml/inputs_test_rz_pml_psatd diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index cb7a754cdc5..9ce0c8769aa 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -1,29 +1,25 @@ # Add tests (alphabetical order) ############################################## # -# point_of_contact_eb_3d ###################################################### -# if(WarpX_EB) add_warpx_test( - point_of_contact_eb_3d # name + test_3d_point_of_contact_eb # name 3 # dims 2 # nprocs ON # eb - Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d # inputs + Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output ) endif() -# point_of_contact_eb_rz ###################################################### -# if(WarpX_EB) add_warpx_test( - point_of_contact_eb_rz # name + test_rz_point_of_contact_eb # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz # inputs + Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output ) diff --git a/Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d b/Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb similarity index 100% rename from Examples/Tests/point_of_contact_eb/inputs_3d_test_point_of_contact_eb_3d rename to Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb diff --git a/Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz b/Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb similarity index 100% rename from Examples/Tests/point_of_contact_eb/inputs_rz_test_point_of_contact_eb_rz rename to Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index 79278b1bfa6..2cd383c156e 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -1,15 +1,13 @@ # Add tests (alphabetical order) ############################################## # -# python_wrappers_picmi ####################################################### -# if(WarpX_FFT) add_warpx_test( - python_wrappers_picmi # name + test_2d_python_wrappers_picmi # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py # inputs + Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output ) diff --git a/Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py b/Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py similarity index 100% rename from Examples/Tests/python_wrappers/inputs_2d_test_python_wrappers_picmi.py rename to Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index bfcb452f8a1..f43ea8cfe4a 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -1,122 +1,102 @@ # Add tests (alphabetical order) ############################################## # -# qed_breit_wheeler_2d ######################################################## -# add_warpx_test( - qed_breit_wheeler_2d # name + test_2d_qed_breit_wheeler # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d # inputs + Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output ) -# qed_breit_wheeler_2d_opmd ################################################### -# add_warpx_test( - qed_breit_wheeler_2d_opmd # name + test_2d_qed_breit_wheeler_opmd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd # inputs + Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output ) -# qed_breit_wheeler_3d ######################################################## -# add_warpx_test( - qed_breit_wheeler_3d # name + test_3d_qed_breit_wheeler # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d # inputs + Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output ) -# qed_breit_wheeler_3d_opmd ################################################### -# add_warpx_test( - qed_breit_wheeler_3d_opmd # name + test_3d_qed_breit_wheeler_opmd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd # inputs + Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output ) -# qed_quantum_sync_2d ######################################################### -# add_warpx_test( - qed_quantum_sync_2d # name + test_2d_qed_quantum_sync # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d # inputs + Examples/Tests/qed/inputs_test_2d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output ) -# qed_quantum_sync_3d ######################################################### -# add_warpx_test( - qed_quantum_sync_3d # name + test_3d_qed_quantum_sync # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d # inputs + Examples/Tests/qed/inputs_test_3d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output ) -# qed_schwinger_1 ############################################################# -# add_warpx_test( - qed_schwinger_1 # name + test_3d_qed_schwinger_1 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 # inputs + Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output ) -# qed_schwinger_2 ############################################################# -# add_warpx_test( - qed_schwinger_2 # name + test_3d_qed_schwinger_2 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 # inputs + Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output ) -# qed_schwinger_3 ############################################################# -# add_warpx_test( - qed_schwinger_3 # name + test_3d_qed_schwinger_3 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 # inputs + Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output ) -# qed_schwinger_4 ############################################################# -# add_warpx_test( - qed_schwinger_4 # name + test_3d_qed_schwinger_4 # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 # inputs + Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d b/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d deleted file mode 100644 index 4c63f5f2899..00000000000 --- a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d +++ /dev/null @@ -1,2 +0,0 @@ -# base input parameters -FILE = inputs_2d_base_breit_wheeler diff --git a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d b/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d deleted file mode 100644 index d60d57e4c5f..00000000000 --- a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d +++ /dev/null @@ -1,2 +0,0 @@ -# base input parameters -FILE = inputs_3d_base_breit_wheeler diff --git a/Examples/Tests/qed/inputs_2d_base_breit_wheeler b/Examples/Tests/qed/inputs_base_2d_breit_wheeler similarity index 100% rename from Examples/Tests/qed/inputs_2d_base_breit_wheeler rename to Examples/Tests/qed/inputs_base_2d_breit_wheeler diff --git a/Examples/Tests/qed/inputs_3d_base_breit_wheeler b/Examples/Tests/qed/inputs_base_3d_breit_wheeler similarity index 100% rename from Examples/Tests/qed/inputs_3d_base_breit_wheeler rename to Examples/Tests/qed/inputs_base_3d_breit_wheeler diff --git a/Examples/Tests/qed/inputs_3d_base_schwinger b/Examples/Tests/qed/inputs_base_3d_schwinger similarity index 100% rename from Examples/Tests/qed/inputs_3d_base_schwinger rename to Examples/Tests/qed/inputs_base_3d_schwinger diff --git a/Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler b/Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler new file mode 100644 index 00000000000..53d3cf9e97c --- /dev/null +++ b/Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_base_2d_breit_wheeler diff --git a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd b/Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd similarity index 73% rename from Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd rename to Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd index f882faff1ba..7edecbcd0a3 100644 --- a/Examples/Tests/qed/inputs_2d_test_qed_breit_wheeler_2d_opmd +++ b/Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_2d_base_breit_wheeler +FILE = inputs_base_2d_breit_wheeler # test input parameters diag1.format = openpmd diff --git a/Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d b/Examples/Tests/qed/inputs_test_2d_qed_quantum_sync similarity index 100% rename from Examples/Tests/qed/inputs_2d_test_qed_quantum_sync_2d rename to Examples/Tests/qed/inputs_test_2d_qed_quantum_sync diff --git a/Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler b/Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler new file mode 100644 index 00000000000..2058dccb493 --- /dev/null +++ b/Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_base_3d_breit_wheeler diff --git a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd b/Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd similarity index 73% rename from Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd rename to Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd index da68c52c917..78847d0a0d4 100644 --- a/Examples/Tests/qed/inputs_3d_test_qed_breit_wheeler_3d_opmd +++ b/Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base_breit_wheeler +FILE = inputs_base_3d_breit_wheeler # test input parameters diag1.format = openpmd diff --git a/Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d b/Examples/Tests/qed/inputs_test_3d_qed_quantum_sync similarity index 100% rename from Examples/Tests/qed/inputs_3d_test_qed_quantum_sync_3d rename to Examples/Tests/qed/inputs_test_3d_qed_quantum_sync diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 similarity index 83% rename from Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 rename to Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 index 96217d7b537..cfa0ca80845 100644 --- a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_1 +++ b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base_schwinger +FILE = inputs_base_3d_schwinger # test input parameters warpx.B_external_grid = 16792888.570516706 5256650.141557486 18363530.799561853 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 similarity index 87% rename from Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 rename to Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 index e27bf1b4239..420e6bce31f 100644 --- a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_2 +++ b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base_schwinger +FILE = inputs_base_3d_schwinger # test input parameters warpx.B_external_grid = 1679288857.0516706 525665014.1557486 1836353079.9561853 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 similarity index 75% rename from Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 rename to Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 index e2e727d1dad..e77ce567f32 100644 --- a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_3 +++ b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base_schwinger +FILE = inputs_base_3d_schwinger # test input parameters warpx.E_external_grid = 0 1.090934525450495e+17 0 diff --git a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 similarity index 85% rename from Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 rename to Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 index d122a0bf66e..78454e8bb75 100644 --- a/Examples/Tests/qed/inputs_3d_test_qed_schwinger_4 +++ b/Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base_schwinger +FILE = inputs_base_3d_schwinger # test input parameters warpx.B_external_grid = 0 833910140000. 0 diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index bb61ab1ce92..b604727d607 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# radiation_reaction ########################################################## -# add_warpx_test( - radiation_reaction # name + test_3d_radiation_reaction # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction # inputs + Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction # inputs Examples/Tests/radiation_reaction/analysis.py # analysis diags/diag1000064 # output ) diff --git a/Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction b/Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction similarity index 100% rename from Examples/Tests/radiation_reaction/inputs_3d_test_radiation_reaction rename to Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index e5439d8f2f8..1ff9936f428 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -1,63 +1,53 @@ # Add tests (alphabetical order) ############################################## # -# reduced_diags ############################################################### -# add_warpx_test( - reduced_diags # name + test_3d_reduced_diags # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags # inputs + Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags # inputs Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis diags/diag1000200 # output ) -# reduced_diags_load_balance_costs_heuristic ################################## -# add_warpx_test( - reduced_diags_load_balance_costs_heuristic # name + test_3d_reduced_diags_load_balance_costs_heuristic # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic # inputs + Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output ) -# reduced_diags_load_balance_costs_timers ##################################### -# add_warpx_test( - reduced_diags_load_balance_costs_timers # name + test_3d_reduced_diags_load_balance_costs_timers # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers # inputs + Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output ) -# reduced_diags_load_balance_costs_timers_picmi ############################### -# add_warpx_test( - reduced_diags_load_balance_costs_timers_picmi # name + test_3d_reduced_diags_load_balance_costs_timers_picmi # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py # inputs + Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output ) -# reduced_diags_load_balance_costs_timers_psatd ############################### -# if(WarpX_FFT) add_warpx_test( - reduced_diags_load_balance_costs_timers_psatd # name + test_3d_reduced_diags_load_balance_costs_timers_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd # inputs + Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output ) diff --git a/Examples/Tests/reduced_diags/inputs_3d_base b/Examples/Tests/reduced_diags/inputs_base_3d similarity index 100% rename from Examples/Tests/reduced_diags/inputs_3d_base rename to Examples/Tests/reduced_diags/inputs_base_3d diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags similarity index 100% rename from Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags rename to Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic similarity index 80% rename from Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic rename to Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic index f9126eca62c..18777d5a1fa 100644 --- a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_heuristic +++ b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.load_balance_costs_update = Heuristic diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers similarity index 80% rename from Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers rename to Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers index 0a4cbef3f76..7d8586cd913 100644 --- a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers +++ b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.load_balance_costs_update = Timers diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py similarity index 100% rename from Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_picmi.py rename to Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py diff --git a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd similarity index 80% rename from Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd rename to Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd index 0a4cbef3f76..7d8586cd913 100644 --- a/Examples/Tests/reduced_diags/inputs_3d_test_reduced_diags_load_balance_costs_timers_psatd +++ b/Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.load_balance_costs_update = Timers diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index 5191b9559e1..b2f5096c0ec 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# relativistic_space_charge_initialization #################################### -# add_warpx_test( - relativistic_space_charge_initialization # name + test_3d_relativistic_space_charge_initialization # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization # inputs + Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization # inputs Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization b/Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization similarity index 100% rename from Examples/Tests/relativistic_space_charge_initialization/inputs_3d_test_relativistic_space_charge_initialization rename to Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index 2efc78eab74..8abae86e5f0 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# repelling_particles ######################################################### -# add_warpx_test( - repelling_particles # name + test_2d_repelling_particles # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles # inputs + Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles # inputs Examples/Tests/repelling_particles/analysis.py # analysis diags/diag1000200 # output ) diff --git a/Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles b/Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles similarity index 100% rename from Examples/Tests/repelling_particles/inputs_2d_test_repelling_particles rename to Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index d8aabdb297d..392cae16eab 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -1,38 +1,32 @@ # Add tests (alphabetical order) ############################################## # -# leveling_thinning ########################################################### -# add_warpx_test( - leveling_thinning # name + test_2d_leveling_thinning # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_2d_test_leveling_thinning # inputs + Examples/Tests/resampling/inputs_test_2d_leveling_thinning # inputs Examples/Tests/resampling/analysis.py # analysis diags/diag1000008 # output ) -# resample_velocity_coincidence_thinning ###################################### -# add_warpx_test( - resample_velocity_coincidence_thinning # name + test_1d_resample_velocity_coincidence_thinning # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning # inputs + Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output ) -# resample_velocity_coincidence_thinning_cartesian ############################ -# add_warpx_test( - resample_velocity_coincidence_thinning_cartesian # name + test_1d_resample_velocity_coincidence_thinning_cartesian # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian # inputs + Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output ) diff --git a/Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning b/Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning similarity index 100% rename from Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning rename to Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning diff --git a/Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian b/Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian similarity index 100% rename from Examples/Tests/resampling/inputs_1d_test_resample_velocity_coincidence_thinning_cartesian rename to Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian diff --git a/Examples/Tests/resampling/inputs_2d_test_leveling_thinning b/Examples/Tests/resampling/inputs_test_2d_leveling_thinning similarity index 100% rename from Examples/Tests/resampling/inputs_2d_test_leveling_thinning rename to Examples/Tests/resampling/inputs_test_2d_leveling_thinning diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 98495c4253f..6383f57bf4b 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -1,106 +1,90 @@ # Add tests (alphabetical order) ############################################## # -# id_cpu_read_picmi ########################################################### -# add_warpx_test( - id_cpu_read_picmi # name + test_2d_id_cpu_read_picmi # name 2 # dims 1 # nprocs OFF # eb - Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py # inputs + Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) # FIXME -# restart_runtime_components_picmi ############################################ -# #add_warpx_test( -# restart_runtime_components_picmi # name +# test_2d_restart_runtime_components_picmi # name # 2 # dims # 1 # nprocs # OFF # eb -# Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py # inputs +# Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000010 # output #) -# acceleration ################################################################ -# add_warpx_test( - acceleration # name + test_3d_acceleration # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration # inputs + Examples/Tests/restart/inputs_test_3d_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# acceleration_restart ######################################################## -# add_warpx_test( - acceleration_restart # name + test_3d_acceleration_restart # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration_restart # inputs + Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) -# acceleration_psatd ########################################################## -# if(WarpX_FFT) add_warpx_test( - acceleration_psatd # name + test_3d_acceleration_psatd # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration_psatd # inputs + Examples/Tests/restart/inputs_test_3d_acceleration_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) endif() -# acceleration_psatd_restart ################################################## -# if(WarpX_FFT) add_warpx_test( - acceleration_psatd_restart # name + test_3d_acceleration_psatd_restart # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart # inputs + Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) endif() -# acceleration_psatd_time_avg ################################################# -# if(WarpX_FFT) add_warpx_test( - acceleration_psatd_time_avg # name + test_3d_acceleration_psatd_time_avg # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg # inputs + Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) endif() -# acceleration_psatd_time_avg_restart ######################################### -# if(WarpX_FFT) add_warpx_test( - acceleration_psatd_time_avg_restart # name + test_3d_acceleration_psatd_time_avg_restart # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart # inputs + Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output ) diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration b/Examples/Tests/restart/inputs_3d_test_acceleration deleted file mode 100644 index 287576a9c7f..00000000000 --- a/Examples/Tests/restart/inputs_3d_test_acceleration +++ /dev/null @@ -1,2 +0,0 @@ -# base input parameters -FILE = inputs_3d_base diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart deleted file mode 100644 index e39fa48f886..00000000000 --- a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_test_acceleration_psatd - -# test input parameters -amr.restart = ../acceleration_psatd/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart deleted file mode 100644 index 1a9946f2af6..00000000000 --- a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_test_acceleration_psatd_time_avg - -# test input parameters -amr.restart = ../acceleration_psatd_time_avg/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_restart b/Examples/Tests/restart/inputs_3d_test_acceleration_restart deleted file mode 100644 index 892b004bba2..00000000000 --- a/Examples/Tests/restart/inputs_3d_test_acceleration_restart +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_test_acceleration - -# test input parameters -amr.restart = ../acceleration/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_base b/Examples/Tests/restart/inputs_base_3d similarity index 100% rename from Examples/Tests/restart/inputs_3d_base rename to Examples/Tests/restart/inputs_base_3d diff --git a/Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py b/Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py similarity index 100% rename from Examples/Tests/restart/inputs_2d_test_id_cpu_read_picmi.py rename to Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py diff --git a/Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py b/Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py similarity index 100% rename from Examples/Tests/restart/inputs_2d_test_restart_runtime_components_picmi.py rename to Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration b/Examples/Tests/restart/inputs_test_3d_acceleration new file mode 100644 index 00000000000..7665a846eef --- /dev/null +++ b/Examples/Tests/restart/inputs_test_3d_acceleration @@ -0,0 +1,2 @@ +# base input parameters +FILE = inputs_base_3d diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd similarity index 93% rename from Examples/Tests/restart/inputs_3d_test_acceleration_psatd rename to Examples/Tests/restart/inputs_test_3d_acceleration_psatd index 7ca600bee13..1f4e258b964 100644 --- a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart new file mode 100644 index 00000000000..8410cce04d1 --- /dev/null +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_3d_acceleration_psatd + +# test input parameters +amr.restart = ../test_3d_acceleration_psatd/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg similarity index 93% rename from Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg rename to Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg index 7ae6037ea15..d9625a7f058 100644 --- a/Examples/Tests/restart/inputs_3d_test_acceleration_psatd_time_avg +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg @@ -1,5 +1,5 @@ # base input parameters -FILE = inputs_3d_base +FILE = inputs_base_3d # test input parameters algo.maxwell_solver = psatd diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart new file mode 100644 index 00000000000..e906d945439 --- /dev/null +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_3d_acceleration_psatd_time_avg + +# test input parameters +amr.restart = ../test_3d_acceleration_psatd_time_avg/diags/chk000005 diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_restart new file mode 100644 index 00000000000..b475d95be49 --- /dev/null +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_restart @@ -0,0 +1,5 @@ +# base input parameters +FILE = inputs_test_3d_acceleration + +# test input parameters +amr.restart = ../test_3d_acceleration/diags/chk000005 diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index 7a9ce73a31a..a53f9c968c6 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# rigid_injection_btd ######################################################### -# add_warpx_test( - rigid_injection_btd # name + test_2d_rigid_injection_btd # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd # inputs + Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis diags/diag1000001 # output ) -# rigid_injection_lab ######################################################### -# add_warpx_test( - rigid_injection_lab # name + test_2d_rigid_injection_lab # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab # inputs + Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis diags/diag1000289 # output ) diff --git a/Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd b/Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd similarity index 100% rename from Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_btd rename to Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd diff --git a/Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab b/Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab similarity index 100% rename from Examples/Tests/rigid_injection/inputs_2d_test_rigid_injection_lab rename to Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index a90a0873636..7033dcc4a85 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -1,29 +1,25 @@ # Add tests (alphabetical order) ############################################## # -# scraping #################################################################### -# if(WarpX_EB) add_warpx_test( - scraping # name + test_rz_scraping # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/scraping/inputs_rz_test_scraping # inputs + Examples/Tests/scraping/inputs_test_rz_scraping # inputs Examples/Tests/scraping/analysis_rz.py # analysis diags/diag1000037 # output ) endif() -# scraping_filter ############################################################# -# if(WarpX_EB) add_warpx_test( - scraping_filter # name + test_rz_scraping_filter # name RZ # dims 2 # nprocs ON # eb - Examples/Tests/scraping/inputs_rz_test_scraping_filter # inputs + Examples/Tests/scraping/inputs_test_rz_scraping_filter # inputs Examples/Tests/scraping/analysis_rz_filter.py # analysis diags/diag1000037 # output ) diff --git a/Examples/Tests/scraping/inputs_rz_test_scraping b/Examples/Tests/scraping/inputs_test_rz_scraping similarity index 100% rename from Examples/Tests/scraping/inputs_rz_test_scraping rename to Examples/Tests/scraping/inputs_test_rz_scraping diff --git a/Examples/Tests/scraping/inputs_rz_test_scraping_filter b/Examples/Tests/scraping/inputs_test_rz_scraping_filter similarity index 100% rename from Examples/Tests/scraping/inputs_rz_test_scraping_filter rename to Examples/Tests/scraping/inputs_test_rz_scraping_filter diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index fece6d65763..cc8e7742752 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -1,50 +1,42 @@ # Add tests (alphabetical order) ############################################## # -# silver_mueller_1d ########################################################### -# add_warpx_test( - silver_mueller_1d # name + test_1d_silver_mueller # name 1 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d # inputs + Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output ) -# silver_mueller_2d_x ######################################################### -# add_warpx_test( - silver_mueller_2d_x # name + test_2d_silver_mueller_x # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x # inputs + Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output ) -# silver_mueller_2d_z ######################################################### -# add_warpx_test( - silver_mueller_2d_z # name + test_2d_silver_mueller_z # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z # inputs + Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output ) -# silver_mueller_rz_z ######################################################### -# add_warpx_test( - silver_mueller_rz_z # name + test_rz_silver_mueller_z # name RZ # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z # inputs + Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output ) diff --git a/Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d b/Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller similarity index 100% rename from Examples/Tests/silver_mueller/inputs_1d_test_silver_mueller_1d rename to Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller diff --git a/Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x b/Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x similarity index 100% rename from Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_x rename to Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x diff --git a/Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z b/Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z similarity index 100% rename from Examples/Tests/silver_mueller/inputs_2d_test_silver_mueller_2d_z rename to Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z diff --git a/Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z b/Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z similarity index 100% rename from Examples/Tests/silver_mueller/inputs_rz_test_silver_mueller_rz_z rename to Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 0efae743174..a8a7cce807a 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# bilinear_filter ############################################################# -# add_warpx_test( - bilinear_filter # name + test_2d_bilinear_filter # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/single_particle/inputs_2d_test_bilinear_filter # inputs - Examples/Tests/single_particle/analysis_bilinear_filter.py # analysis + Examples/Tests/single_particle/inputs_test_2d_bilinear_filter # inputs + Examples/Tests/single_particle/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/single_particle/analysis_bilinear_filter.py b/Examples/Tests/single_particle/analysis.py similarity index 100% rename from Examples/Tests/single_particle/analysis_bilinear_filter.py rename to Examples/Tests/single_particle/analysis.py diff --git a/Examples/Tests/single_particle/inputs_2d_test_bilinear_filter b/Examples/Tests/single_particle/inputs_test_2d_bilinear_filter similarity index 100% rename from Examples/Tests/single_particle/inputs_2d_test_bilinear_filter rename to Examples/Tests/single_particle/inputs_test_2d_bilinear_filter diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index a1dfdcc7362..080bb471b75 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -1,26 +1,22 @@ # Add tests (alphabetical order) ############################################## # -# space_charge_initialization_2d ############################################## -# add_warpx_test( - space_charge_initialization_2d # name + test_2d_space_charge_initialization # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d # inputs + Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output ) -# space_charge_initialization_3d ############################################## -# add_warpx_test( - space_charge_initialization_3d # name + test_3d_space_charge_initialization # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d # inputs + Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output ) diff --git a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d deleted file mode 100644 index a02b4f1d2cd..00000000000 --- a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_2d +++ /dev/null @@ -1,5 +0,0 @@ -# base input parameters -FILE = inputs_3d_base - -# test input parameters -geometry.dims = 2 diff --git a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d b/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d deleted file mode 100644 index 287576a9c7f..00000000000 --- a/Examples/Tests/space_charge_initialization/inputs_3d_test_space_charge_initialization_3d +++ /dev/null @@ -1,2 +0,0 @@ -# base input parameters -FILE = inputs_3d_base diff --git a/Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization b/Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization new file mode 100644 index 00000000000..4445217225c --- /dev/null +++ b/Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization @@ -0,0 +1,37 @@ +max_step = 1 +amr.n_cell = 128 128 +amr.max_grid_size = 32 +amr.max_level = 0 + +geometry.dims = 3 +boundary.field_lo = pec pec +boundary.field_hi = pec pec +geometry.prob_lo = -50.e-6 -50.e-6 +geometry.prob_hi = 50.e-6 50.e-6 +geometry.dims = 2 + +warpx.cfl = 1.e-3 + +# Order of particle shape factors +algo.particle_shape = 1 + +particles.species_names = beam +beam.charge = -q_e +beam.mass = m_e +beam.injection_style = "gaussian_beam" +beam.initialize_self_fields = 1 +beam.x_rms = 2.e-6 +beam.y_rms = 2.e-6 +beam.z_rms = 2.e-6 +beam.x_m = 0. +beam.y_m = 0. +beam.z_m = 0.e-6 +beam.npart = 20000 +beam.q_tot = -1.e-20 +beam.momentum_distribution_type = "at_rest" + +# Diagnostics +diagnostics.diags_names = diag1 +diag1.intervals = 1 +diag1.diag_type = Full +diag1.fields_to_plot = Ex Ey Ez jx jy jz diff --git a/Examples/Tests/space_charge_initialization/inputs_3d_base b/Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization similarity index 97% rename from Examples/Tests/space_charge_initialization/inputs_3d_base rename to Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization index c8058fac519..d7a9f42fa70 100644 --- a/Examples/Tests/space_charge_initialization/inputs_3d_base +++ b/Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization @@ -8,6 +8,7 @@ boundary.field_lo = pec pec pec boundary.field_hi = pec pec pec geometry.prob_lo = -50.e-6 -50.e-6 -50.e-6 geometry.prob_hi = 50.e-6 50.e-6 50.e-6 +geometry.dims = 3 warpx.cfl = 1.e-3 diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index dc4bee4fad8..5b14edfae17 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -1,14 +1,12 @@ # Add tests (alphabetical order) ############################################## # -# subcycling_mr ############################################################### -# add_warpx_test( - subcycling_mr # name + test_2d_subcycling_mr # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/subcycling/inputs_2d_test_subcycling_mr # inputs + Examples/Tests/subcycling/inputs_test_2d_subcycling_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000250 # output ) diff --git a/Examples/Tests/subcycling/inputs_2d_test_subcycling_mr b/Examples/Tests/subcycling/inputs_test_2d_subcycling_mr similarity index 100% rename from Examples/Tests/subcycling/inputs_2d_test_subcycling_mr rename to Examples/Tests/subcycling/inputs_test_2d_subcycling_mr diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index 1e6adf525a4..dd72be5dbf2 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -1,29 +1,25 @@ # Add tests (alphabetical order) ############################################## # -# vay_deposition_2d ########################################################### -# if(WarpX_FFT) add_warpx_test( - vay_deposition_2d # name + test_2d_vay_deposition # name 2 # dims 2 # nprocs OFF # eb - Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d # inputs + Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000050 # output ) endif() -# vay_deposition_3d ########################################################### -# if(WarpX_FFT) add_warpx_test( - vay_deposition_3d # name + test_3d_vay_deposition # name 3 # dims 2 # nprocs OFF # eb - Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d # inputs + Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000025 # output ) diff --git a/Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d b/Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition similarity index 100% rename from Examples/Tests/vay_deposition/inputs_2d_test_vay_deposition_2d rename to Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition diff --git a/Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d b/Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition similarity index 100% rename from Examples/Tests/vay_deposition/inputs_3d_test_vay_deposition_3d rename to Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition diff --git a/Regression/Checksum/benchmarks_json/collision_z.json b/Regression/Checksum/benchmarks_json/test_1d_collision_z.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collision_z.json rename to Regression/Checksum/benchmarks_json/test_1d_collision_z.json diff --git a/Regression/Checksum/benchmarks_json/dsmc_1d_picmi.json b/Regression/Checksum/benchmarks_json/test_1d_dsmc_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/dsmc_1d_picmi.json rename to Regression/Checksum/benchmarks_json/test_1d_dsmc_picmi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_fluid_1d.json b/Regression/Checksum/benchmarks_json/test_1d_langmuir_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_fluid_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_langmuir_fluid.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_1d.json b/Regression/Checksum/benchmarks_json/test_1d_langmuir_multi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_langmuir_multi.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_1d.json b/Regression/Checksum/benchmarks_json/test_1d_laser_acceleration.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_acceleration.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid.json b/Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_fluid.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid_boosted.json b/Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_fluid_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_1d_fluid_boosted.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_fluid_boosted.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_1d_picmi.json b/Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_1d_picmi.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_acceleration_picmi.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_1d.json b/Regression/Checksum/benchmarks_json/test_1d_laser_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_injection.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d.json b/Regression/Checksum/benchmarks_json/test_1d_laser_injection_from_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_injection_from_lasy_file.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d_boost.json b/Regression/Checksum/benchmarks_json/test_1d_laser_injection_from_lasy_file_boost.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_1d_boost.json rename to Regression/Checksum/benchmarks_json/test_1d_laser_injection_from_lasy_file_boost.json diff --git a/Regression/Checksum/benchmarks_json/Python_ohms_law_solver_ion_beam_1d.json b/Regression/Checksum/benchmarks_json/test_1d_ohm_law_solver_ion_beam_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ohms_law_solver_ion_beam_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_ohm_law_solver_ion_beam_picmi.json diff --git a/Regression/Checksum/benchmarks_json/ohm_solver_em_modes_1d_picmi.json b/Regression/Checksum/benchmarks_json/test_1d_ohm_solver_em_modes_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ohm_solver_em_modes_1d_picmi.json rename to Regression/Checksum/benchmarks_json/test_1d_ohm_solver_em_modes_picmi.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_1d_picmi.json b/Regression/Checksum/benchmarks_json/test_1d_plasma_acceleration_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_1d_picmi.json rename to Regression/Checksum/benchmarks_json/test_1d_plasma_acceleration_picmi.json diff --git a/Regression/Checksum/benchmarks_json/resample_velocity_coincidence_thinning.json b/Regression/Checksum/benchmarks_json/test_1d_resample_velocity_coincidence_thinning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/resample_velocity_coincidence_thinning.json rename to Regression/Checksum/benchmarks_json/test_1d_resample_velocity_coincidence_thinning.json diff --git a/Regression/Checksum/benchmarks_json/resample_velocity_coincidence_thinning_cartesian.json b/Regression/Checksum/benchmarks_json/test_1d_resample_velocity_coincidence_thinning_cartesian.json similarity index 100% rename from Regression/Checksum/benchmarks_json/resample_velocity_coincidence_thinning_cartesian.json rename to Regression/Checksum/benchmarks_json/test_1d_resample_velocity_coincidence_thinning_cartesian.json diff --git a/Regression/Checksum/benchmarks_json/semi_implicit_picard_1d.json b/Regression/Checksum/benchmarks_json/test_1d_semi_implicit_picard.json similarity index 100% rename from Regression/Checksum/benchmarks_json/semi_implicit_picard_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_semi_implicit_picard.json diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_1d.json b/Regression/Checksum/benchmarks_json/test_1d_silver_mueller.json similarity index 100% rename from Regression/Checksum/benchmarks_json/silver_mueller_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_silver_mueller.json diff --git a/Regression/Checksum/benchmarks_json/theta_implicit_picard_1d.json b/Regression/Checksum/benchmarks_json/test_1d_theta_implicit_picard.json similarity index 100% rename from Regression/Checksum/benchmarks_json/theta_implicit_picard_1d.json rename to Regression/Checksum/benchmarks_json/test_1d_theta_implicit_picard.json diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_2d_psatd.json b/Regression/Checksum/benchmarks_json/test_2d_averaged_galilean_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/averaged_galilean_2d_psatd.json rename to Regression/Checksum/benchmarks_json/test_2d_averaged_galilean_psatd.json diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/test_2d_averaged_galilean_psatd_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/averaged_galilean_2d_psatd_hybrid.json rename to Regression/Checksum/benchmarks_json/test_2d_averaged_galilean_psatd_hybrid.json diff --git a/Regression/Checksum/benchmarks_json/background_mcc.json b/Regression/Checksum/benchmarks_json/test_2d_background_mcc.json similarity index 100% rename from Regression/Checksum/benchmarks_json/background_mcc.json rename to Regression/Checksum/benchmarks_json/test_2d_background_mcc.json diff --git a/Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json b/Regression/Checksum/benchmarks_json/test_2d_background_mcc_dp_psp.json similarity index 100% rename from Regression/Checksum/benchmarks_json/background_mcc_dp_psp.json rename to Regression/Checksum/benchmarks_json/test_2d_background_mcc_dp_psp.json diff --git a/Regression/Checksum/benchmarks_json/bilinear_filter.json b/Regression/Checksum/benchmarks_json/test_2d_bilinear_filter.json similarity index 100% rename from Regression/Checksum/benchmarks_json/bilinear_filter.json rename to Regression/Checksum/benchmarks_json/test_2d_bilinear_filter.json diff --git a/Regression/Checksum/benchmarks_json/collision_xz.json b/Regression/Checksum/benchmarks_json/test_2d_collision_xz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collision_xz.json rename to Regression/Checksum/benchmarks_json/test_2d_collision_xz.json diff --git a/Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/test_2d_comoving_psatd_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/comoving_2d_psatd_hybrid.json rename to Regression/Checksum/benchmarks_json/test_2d_comoving_psatd_hybrid.json diff --git a/Regression/Checksum/benchmarks_json/dive_cleaning_2d.json b/Regression/Checksum/benchmarks_json/test_2d_dive_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/dive_cleaning_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_dive_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_cube_2d.json b/Regression/Checksum/benchmarks_json/test_2d_embedded_boundary_cube.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_cube_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_embedded_boundary_cube.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_2d.json b/Regression/Checksum/benchmarks_json/test_2d_embedded_boundary_rotated_cube.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_embedded_boundary_rotated_cube.json diff --git a/Regression/Checksum/benchmarks_json/embedded_circle.json b/Regression/Checksum/benchmarks_json/test_2d_embedded_circle.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_circle.json rename to Regression/Checksum/benchmarks_json/test_2d_embedded_circle.json diff --git a/Regression/Checksum/benchmarks_json/energy_conserving_thermal_plasma.json b/Regression/Checksum/benchmarks_json/test_2d_energy_conserving_thermal_plasma.json similarity index 100% rename from Regression/Checksum/benchmarks_json/energy_conserving_thermal_plasma.json rename to Regression/Checksum/benchmarks_json/test_2d_energy_conserving_thermal_plasma.json diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd.json b/Regression/Checksum/benchmarks_json/test_2d_galilean_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_2d_psatd.json rename to Regression/Checksum/benchmarks_json/test_2d_galilean_psatd.json diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_2d_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_current_correction_psb.json b/Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_current_correction_psb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_2d_psatd_current_correction_psb.json rename to Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_current_correction_psb.json diff --git a/Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_2d_psatd_hybrid.json rename to Regression/Checksum/benchmarks_json/test_2d_galilean_psatd_hybrid.json diff --git a/Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_id_cpu_read_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/id_cpu_read_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_id_cpu_read_picmi.json diff --git a/Regression/Checksum/benchmarks_json/ionization_boost.json b/Regression/Checksum/benchmarks_json/test_2d_ionization_boost.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ionization_boost.json rename to Regression/Checksum/benchmarks_json/test_2d_ionization_boost.json diff --git a/Regression/Checksum/benchmarks_json/ionization_lab.json b/Regression/Checksum/benchmarks_json/test_2d_ionization_lab.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ionization_lab.json rename to Regression/Checksum/benchmarks_json/test_2d_ionization_lab.json diff --git a/Regression/Checksum/benchmarks_json/ionization_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_ionization_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ionization_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_ionization_picmi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_fluid_2d.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_fluid_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_fluid.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_anisotropic.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_anisotropic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_anisotropic.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_anisotropic.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_momentum_conserving.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_psatd.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_mr_psatd.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_mr_psatd.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_nodal.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_nodal.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_picmi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction_nodal.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_current_correction_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_current_correction_nodal.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_current_correction_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_momentum_conserving.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ_nodal.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_multiJ_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_multiJ_nodal.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_multiJ_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_nodal.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_nodal.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_nodal.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_nodal.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json b/Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_2d_psatd_vay_deposition_particle_shape_4.json rename to Regression/Checksum/benchmarks_json/test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4.json diff --git a/Regression/Checksum/benchmarks_json/larmor.json b/Regression/Checksum/benchmarks_json/test_2d_larmor.json similarity index 100% rename from Regression/Checksum/benchmarks_json/larmor.json rename to Regression/Checksum/benchmarks_json/test_2d_larmor.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_2d_boosted.json b/Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_2d_boosted.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_boosted.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr.json b/Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_mr.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_mr_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_2d_mr_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_acceleration_mr_picmi.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_2d.json b/Regression/Checksum/benchmarks_json/test_2d_laser_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_injection.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_binary_file.json b/Regression/Checksum/benchmarks_json/test_2d_laser_injection_from_binary_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_binary_file.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_injection_from_binary_file.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_2d.json b/Regression/Checksum/benchmarks_json/test_2d_laser_injection_from_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_injection_from_lasy_file.json diff --git a/Regression/Checksum/benchmarks_json/laser_ion_acc_2d.json b/Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_ion_acc_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc.json diff --git a/Regression/Checksum/benchmarks_json/LaserIonAcc2d_no_field_diag.json b/Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc_no_field_diag.json similarity index 100% rename from Regression/Checksum/benchmarks_json/LaserIonAcc2d_no_field_diag.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc_no_field_diag.json diff --git a/Regression/Checksum/benchmarks_json/laser_ion_acc_2d_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_ion_acc_2d_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_ion_acc_picmi.json diff --git a/Regression/Checksum/benchmarks_json/laser_on_fine.json b/Regression/Checksum/benchmarks_json/test_2d_laser_on_fine.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_on_fine.json rename to Regression/Checksum/benchmarks_json/test_2d_laser_on_fine.json diff --git a/Regression/Checksum/benchmarks_json/leveling_thinning.json b/Regression/Checksum/benchmarks_json/test_2d_leveling_thinning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/leveling_thinning.json rename to Regression/Checksum/benchmarks_json/test_2d_leveling_thinning.json diff --git a/Regression/Checksum/benchmarks_json/maxwell_hybrid_qed_solver.json b/Regression/Checksum/benchmarks_json/test_2d_maxwell_hybrid_qed_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/maxwell_hybrid_qed_solver.json rename to Regression/Checksum/benchmarks_json/test_2d_maxwell_hybrid_qed_solver.json diff --git a/Regression/Checksum/benchmarks_json/nci_corrector.json b/Regression/Checksum/benchmarks_json/test_2d_nci_corrector.json similarity index 100% rename from Regression/Checksum/benchmarks_json/nci_corrector.json rename to Regression/Checksum/benchmarks_json/test_2d_nci_corrector.json diff --git a/Regression/Checksum/benchmarks_json/nci_corrector_mr.json b/Regression/Checksum/benchmarks_json/test_2d_nci_corrector_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/nci_corrector_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_nci_corrector_mr.json diff --git a/Regression/Checksum/benchmarks_json/Python_ohms_law_solver_landau_damping_2d.json b/Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_landau_damping_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ohms_law_solver_landau_damping_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_landau_damping_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_ohms_law_solver_magnetic_reconnection_2d.json b/Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_magnetic_reconnection_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_ohms_law_solver_magnetic_reconnection_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_magnetic_reconnection_picmi.json diff --git a/Regression/Checksum/benchmarks_json/parabolic_channel_initialization_2d_single_precision.json b/Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/parabolic_channel_initialization_2d_single_precision.json rename to Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/particle_thermal_boundary.json b/Regression/Checksum/benchmarks_json/test_2d_particle_thermal_boundary.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_thermal_boundary.json rename to Regression/Checksum/benchmarks_json/test_2d_particle_thermal_boundary.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_2d.json b/Regression/Checksum/benchmarks_json/test_2d_particles_in_pml.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_particles_in_pml.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_2d_mr.json b/Regression/Checksum/benchmarks_json/test_2d_particles_in_pml_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_2d_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_particles_in_pml_mr.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_2d.json b/Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_boosted.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr.json b/Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_mr.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr_momentum_conserving.json b/Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_mr_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_2d_mr_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/test_2d_plasma_acceleration_mr_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/plasma_mirror.json b/Regression/Checksum/benchmarks_json/test_2d_plasma_mirror.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_mirror.json rename to Regression/Checksum/benchmarks_json/test_2d_plasma_mirror.json diff --git a/Regression/Checksum/benchmarks_json/pml_x_ckc.json b/Regression/Checksum/benchmarks_json/test_2d_pml_x_ckc.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_x_ckc.json rename to Regression/Checksum/benchmarks_json/test_2d_pml_x_ckc.json diff --git a/Regression/Checksum/benchmarks_json/pml_x_galilean.json b/Regression/Checksum/benchmarks_json/test_2d_pml_x_galilean.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_x_galilean.json rename to Regression/Checksum/benchmarks_json/test_2d_pml_x_galilean.json diff --git a/Regression/Checksum/benchmarks_json/pml_x_psatd.json b/Regression/Checksum/benchmarks_json/test_2d_pml_x_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_x_psatd.json rename to Regression/Checksum/benchmarks_json/test_2d_pml_x_psatd.json diff --git a/Regression/Checksum/benchmarks_json/pml_x_yee.json b/Regression/Checksum/benchmarks_json/test_2d_pml_x_yee.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_x_yee.json rename to Regression/Checksum/benchmarks_json/test_2d_pml_x_yee.json diff --git a/Regression/Checksum/benchmarks_json/pml_x_yee_eb.json b/Regression/Checksum/benchmarks_json/test_2d_pml_x_yee_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_x_yee_eb.json rename to Regression/Checksum/benchmarks_json/test_2d_pml_x_yee_eb.json diff --git a/Regression/Checksum/benchmarks_json/prev_positions_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_prev_positions_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/prev_positions_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_prev_positions_picmi.json diff --git a/Regression/Checksum/benchmarks_json/proton_boron_fusion_2d.json b/Regression/Checksum/benchmarks_json/test_2d_proton_boron_fusion.json similarity index 100% rename from Regression/Checksum/benchmarks_json/proton_boron_fusion_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_proton_boron_fusion.json diff --git a/Regression/Checksum/benchmarks_json/python_wrappers_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_python_wrappers_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/python_wrappers_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_python_wrappers_picmi.json diff --git a/Regression/Checksum/benchmarks_json/qed_breit_wheeler_2d.json b/Regression/Checksum/benchmarks_json/test_2d_qed_breit_wheeler.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_breit_wheeler_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_qed_breit_wheeler.json diff --git a/Regression/Checksum/benchmarks_json/qed_quantum_sync_2d.json b/Regression/Checksum/benchmarks_json/test_2d_qed_quantum_sync.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_quantum_sync_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_qed_quantum_sync.json diff --git a/Regression/Checksum/benchmarks_json/refined_injection.json b/Regression/Checksum/benchmarks_json/test_2d_refined_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/refined_injection.json rename to Regression/Checksum/benchmarks_json/test_2d_refined_injection.json diff --git a/Regression/Checksum/benchmarks_json/repelling_particles.json b/Regression/Checksum/benchmarks_json/test_2d_repelling_particles.json similarity index 100% rename from Regression/Checksum/benchmarks_json/repelling_particles.json rename to Regression/Checksum/benchmarks_json/test_2d_repelling_particles.json diff --git a/Regression/Checksum/benchmarks_json/rigid_injection_btd.json b/Regression/Checksum/benchmarks_json/test_2d_rigid_injection_btd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/rigid_injection_btd.json rename to Regression/Checksum/benchmarks_json/test_2d_rigid_injection_btd.json diff --git a/Regression/Checksum/benchmarks_json/rigid_injection_lab.json b/Regression/Checksum/benchmarks_json/test_2d_rigid_injection_lab.json similarity index 100% rename from Regression/Checksum/benchmarks_json/rigid_injection_lab.json rename to Regression/Checksum/benchmarks_json/test_2d_rigid_injection_lab.json diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json b/Regression/Checksum/benchmarks_json/test_2d_silver_mueller_x.json similarity index 100% rename from Regression/Checksum/benchmarks_json/silver_mueller_2d_x.json rename to Regression/Checksum/benchmarks_json/test_2d_silver_mueller_x.json diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json b/Regression/Checksum/benchmarks_json/test_2d_silver_mueller_z.json similarity index 100% rename from Regression/Checksum/benchmarks_json/silver_mueller_2d_z.json rename to Regression/Checksum/benchmarks_json/test_2d_silver_mueller_z.json diff --git a/Regression/Checksum/benchmarks_json/space_charge_initialization_2d.json b/Regression/Checksum/benchmarks_json/test_2d_space_charge_initialization.json similarity index 100% rename from Regression/Checksum/benchmarks_json/space_charge_initialization_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_space_charge_initialization.json diff --git a/Regression/Checksum/benchmarks_json/subcycling_mr.json b/Regression/Checksum/benchmarks_json/test_2d_subcycling_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/subcycling_mr.json rename to Regression/Checksum/benchmarks_json/test_2d_subcycling_mr.json diff --git a/Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d.json b/Regression/Checksum/benchmarks_json/test_2d_theta_implicit_jfnk_vandb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_theta_implicit_jfnk_vandb.json diff --git a/Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_theta_implicit_jfnk_vandb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/theta_implicit_jfnk_vandb_2d_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_theta_implicit_jfnk_vandb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/uniform_plasma_2d.json b/Regression/Checksum/benchmarks_json/test_2d_uniform_plasma.json similarity index 100% rename from Regression/Checksum/benchmarks_json/uniform_plasma_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_uniform_plasma.json diff --git a/Regression/Checksum/benchmarks_json/vay_deposition_2d.json b/Regression/Checksum/benchmarks_json/test_2d_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/vay_deposition_2d.json rename to Regression/Checksum/benchmarks_json/test_2d_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/acceleration.json b/Regression/Checksum/benchmarks_json/test_3d_acceleration.json similarity index 100% rename from Regression/Checksum/benchmarks_json/acceleration.json rename to Regression/Checksum/benchmarks_json/test_3d_acceleration.json diff --git a/Regression/Checksum/benchmarks_json/acceleration_psatd.json b/Regression/Checksum/benchmarks_json/test_3d_acceleration_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/acceleration_psatd.json rename to Regression/Checksum/benchmarks_json/test_3d_acceleration_psatd.json diff --git a/Regression/Checksum/benchmarks_json/acceleration_psatd_time_avg.json b/Regression/Checksum/benchmarks_json/test_3d_acceleration_psatd_time_avg.json similarity index 100% rename from Regression/Checksum/benchmarks_json/acceleration_psatd_time_avg.json rename to Regression/Checksum/benchmarks_json/test_3d_acceleration_psatd_time_avg.json diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json b/Regression/Checksum/benchmarks_json/test_3d_averaged_galilean_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd.json rename to Regression/Checksum/benchmarks_json/test_3d_averaged_galilean_psatd.json diff --git a/Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json b/Regression/Checksum/benchmarks_json/test_3d_averaged_galilean_psatd_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/averaged_galilean_3d_psatd_hybrid.json rename to Regression/Checksum/benchmarks_json/test_3d_averaged_galilean_psatd_hybrid.json diff --git a/Regression/Checksum/benchmarks_json/beam_beam_collision.json b/Regression/Checksum/benchmarks_json/test_3d_beam_beam_collision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/beam_beam_collision.json rename to Regression/Checksum/benchmarks_json/test_3d_beam_beam_collision.json diff --git a/Regression/Checksum/benchmarks_json/collider_diagnostics.json b/Regression/Checksum/benchmarks_json/test_3d_collider_diagnostics.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collider_diagnostics.json rename to Regression/Checksum/benchmarks_json/test_3d_collider_diagnostics.json diff --git a/Regression/Checksum/benchmarks_json/collision_iso.json b/Regression/Checksum/benchmarks_json/test_3d_collision_iso.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collision_iso.json rename to Regression/Checksum/benchmarks_json/test_3d_collision_iso.json diff --git a/Regression/Checksum/benchmarks_json/collision_xyz.json b/Regression/Checksum/benchmarks_json/test_3d_collision_xyz.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collision_xyz.json rename to Regression/Checksum/benchmarks_json/test_3d_collision_xyz.json diff --git a/Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d.json b/Regression/Checksum/benchmarks_json/test_3d_deuterium_deuterium_fusion.json similarity index 100% rename from Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_deuterium_deuterium_fusion.json diff --git a/Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d_intraspecies.json b/Regression/Checksum/benchmarks_json/test_3d_deuterium_deuterium_fusion_intraspecies.json similarity index 100% rename from Regression/Checksum/benchmarks_json/deuterium_deuterium_fusion_3d_intraspecies.json rename to Regression/Checksum/benchmarks_json/test_3d_deuterium_deuterium_fusion_intraspecies.json diff --git a/Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_3d.json b/Regression/Checksum/benchmarks_json/test_3d_deuterium_tritium_fusion.json similarity index 100% rename from Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_deuterium_tritium_fusion.json diff --git a/Regression/Checksum/benchmarks_json/divb_cleaning_3d.json b/Regression/Checksum/benchmarks_json/test_3d_divb_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/divb_cleaning_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_divb_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/dive_cleaning_3d.json b/Regression/Checksum/benchmarks_json/test_3d_dive_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/dive_cleaning_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_dive_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_eb.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_mixed_bc.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb_mixed_bc.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_mixed_bc.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb_mixed_bc.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_eb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_lab_frame.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_lab_frame.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_mr_emass_10.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_lab_frame_mr_emass_10.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_lab_frame_mr_emass_10.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_lab_frame_mr_emass_10.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_rel_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_rel_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_rel_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_electrostatic_sphere_rel_nodal.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d.json b/Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_cube.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_cube.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d_macroscopic.json b/Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_cube_macroscopic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_cube_3d_macroscopic.json rename to Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_cube_macroscopic.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_3d.json b/Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_rotated_cube.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_rotated_cube_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_embedded_boundary_rotated_cube.json diff --git a/Regression/Checksum/benchmarks_json/flux_injection_3d.json b/Regression/Checksum/benchmarks_json/test_3d_flux_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/flux_injection_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_flux_injection.json diff --git a/Regression/Checksum/benchmarks_json/focusing_gaussian_beam.json b/Regression/Checksum/benchmarks_json/test_3d_focusing_gaussian_beam.json similarity index 100% rename from Regression/Checksum/benchmarks_json/focusing_gaussian_beam.json rename to Regression/Checksum/benchmarks_json/test_3d_focusing_gaussian_beam.json diff --git a/Regression/Checksum/benchmarks_json/galilean_3d_psatd.json b/Regression/Checksum/benchmarks_json/test_3d_galilean_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_3d_psatd.json rename to Regression/Checksum/benchmarks_json/test_3d_galilean_psatd.json diff --git a/Regression/Checksum/benchmarks_json/galilean_3d_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_3d_galilean_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_3d_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_3d_galilean_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/galilean_3d_psatd_current_correction_psb.json b/Regression/Checksum/benchmarks_json/test_3d_galilean_psatd_current_correction_psb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_3d_psatd_current_correction_psb.json rename to Regression/Checksum/benchmarks_json/test_3d_galilean_psatd_current_correction_psb.json diff --git a/Regression/Checksum/benchmarks_json/gaussian_beam_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_gaussian_beam_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/gaussian_beam_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_gaussian_beam_picmi.json diff --git a/Regression/Checksum/benchmarks_json/hard_edged_quadrupoles.json b/Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles.json similarity index 100% rename from Regression/Checksum/benchmarks_json/hard_edged_quadrupoles.json rename to Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles.json diff --git a/Regression/Checksum/benchmarks_json/hard_edged_quadrupoles_boosted.json b/Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/hard_edged_quadrupoles_boosted.json rename to Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles_boosted.json diff --git a/Regression/Checksum/benchmarks_json/hard_edged_quadrupoles_moving.json b/Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles_moving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/hard_edged_quadrupoles_moving.json rename to Regression/Checksum/benchmarks_json/test_3d_hard_edged_quadrupoles_moving.json diff --git a/Regression/Checksum/benchmarks_json/initial_distribution.json b/Regression/Checksum/benchmarks_json/test_3d_initial_distribution.json similarity index 100% rename from Regression/Checksum/benchmarks_json/initial_distribution.json rename to Regression/Checksum/benchmarks_json/test_3d_initial_distribution.json diff --git a/Regression/Checksum/benchmarks_json/ion_stopping.json b/Regression/Checksum/benchmarks_json/test_3d_ion_stopping.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ion_stopping.json rename to Regression/Checksum/benchmarks_json/test_3d_ion_stopping.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_fluid_3d.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_fluid_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_fluid.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_picmi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_current_correction_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_current_correction_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_current_correction_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_div_cleaning.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_div_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_div_cleaning.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_div_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_momentum_conserving.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_momentum_conserving.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_momentum_conserving.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_momentum_conserving.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_multiJ_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_multiJ_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_multiJ_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_single_precision.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_single_precision.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition_nodal.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_vay_deposition_nodal.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_psatd_vay_deposition_nodal.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_psatd_vay_deposition_nodal.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_3d_single_precision.json b/Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_3d_single_precision.json rename to Regression/Checksum/benchmarks_json/test_3d_langmuir_multi_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_3d.json b/Regression/Checksum/benchmarks_json/test_3d_laser_acceleration.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_acceleration.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_btd.json b/Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_btd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_btd.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_btd.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_3d_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_3d_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_picmi.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_3d_single_precision_comms.json b/Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_single_precision_comms.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_3d_single_precision_comms.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_acceleration_single_precision_comms.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_3d.json b/Regression/Checksum/benchmarks_json/test_3d_laser_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_injection.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_3d.json b/Regression/Checksum/benchmarks_json/test_3d_laser_injection_from_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_laser_injection_from_lasy_file.json diff --git a/Regression/Checksum/benchmarks_json/load_external_field_3d_grid_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_load_external_field_grid_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/load_external_field_3d_grid_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_load_external_field_grid_picmi.json diff --git a/Regression/Checksum/benchmarks_json/load_external_field_3d_particle_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_load_external_field_particle_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/load_external_field_3d_particle_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_load_external_field_particle_picmi.json diff --git a/Regression/Checksum/benchmarks_json/magnetostatic_eb_3d.json b/Regression/Checksum/benchmarks_json/test_3d_magnetostatic_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/magnetostatic_eb_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_magnetostatic_eb.json diff --git a/Regression/Checksum/benchmarks_json/magnetostatic_eb_3d_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_magnetostatic_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/magnetostatic_eb_3d_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_magnetostatic_eb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/nodal_electrostatic_solver.json b/Regression/Checksum/benchmarks_json/test_3d_nodal_electrostatic_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/nodal_electrostatic_solver.json rename to Regression/Checksum/benchmarks_json/test_3d_nodal_electrostatic_solver.json diff --git a/Regression/Checksum/benchmarks_json/open_bc_poisson_solver.json b/Regression/Checksum/benchmarks_json/test_3d_open_bc_poisson_solver.json similarity index 100% rename from Regression/Checksum/benchmarks_json/open_bc_poisson_solver.json rename to Regression/Checksum/benchmarks_json/test_3d_open_bc_poisson_solver.json diff --git a/Regression/Checksum/benchmarks_json/particle_boundaries_3d.json b/Regression/Checksum/benchmarks_json/test_3d_particle_boundaries.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_boundaries_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_particle_boundaries.json diff --git a/Regression/Checksum/benchmarks_json/particle_fields_diags.json b/Regression/Checksum/benchmarks_json/test_3d_particle_fields_diags.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_fields_diags.json rename to Regression/Checksum/benchmarks_json/test_3d_particle_fields_diags.json diff --git a/Regression/Checksum/benchmarks_json/particle_fields_diags_single_precision.json b/Regression/Checksum/benchmarks_json/test_3d_particle_fields_diags_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_fields_diags_single_precision.json rename to Regression/Checksum/benchmarks_json/test_3d_particle_fields_diags_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/particle_pusher.json b/Regression/Checksum/benchmarks_json/test_3d_particle_pusher.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_pusher.json rename to Regression/Checksum/benchmarks_json/test_3d_particle_pusher.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_3d.json b/Regression/Checksum/benchmarks_json/test_3d_particles_in_pml.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_particles_in_pml.json diff --git a/Regression/Checksum/benchmarks_json/particles_in_pml_3d_mr.json b/Regression/Checksum/benchmarks_json/test_3d_particles_in_pml_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particles_in_pml_3d_mr.json rename to Regression/Checksum/benchmarks_json/test_3d_particles_in_pml_mr.json diff --git a/Regression/Checksum/benchmarks_json/pec_field.json b/Regression/Checksum/benchmarks_json/test_3d_pec_field.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pec_field.json rename to Regression/Checksum/benchmarks_json/test_3d_pec_field.json diff --git a/Regression/Checksum/benchmarks_json/pec_field_mr.json b/Regression/Checksum/benchmarks_json/test_3d_pec_field_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pec_field_mr.json rename to Regression/Checksum/benchmarks_json/test_3d_pec_field_mr.json diff --git a/Regression/Checksum/benchmarks_json/pec_particle.json b/Regression/Checksum/benchmarks_json/test_3d_pec_particle.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pec_particle.json rename to Regression/Checksum/benchmarks_json/test_3d_pec_particle.json diff --git a/Regression/Checksum/benchmarks_json/photon_pusher.json b/Regression/Checksum/benchmarks_json/test_3d_photon_pusher.json similarity index 100% rename from Regression/Checksum/benchmarks_json/photon_pusher.json rename to Regression/Checksum/benchmarks_json/test_3d_photon_pusher.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_boosted.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d_hybrid.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_boosted_hybrid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_boosted_3d_hybrid.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_boosted_hybrid.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_3d_mr_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_mr_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_3d_mr_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_mr_picmi.json diff --git a/Regression/Checksum/benchmarks_json/plasma_acceleration_3d_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_acceleration_3d_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_acceleration_picmi.json diff --git a/Regression/Checksum/benchmarks_json/plasma_lens.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_lens.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_lens.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_lens.json diff --git a/Regression/Checksum/benchmarks_json/plasma_lens_boosted.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_lens_boosted.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_lens_boosted.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_lens_boosted.json diff --git a/Regression/Checksum/benchmarks_json/plasma_lens_hard_edged.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_lens_hard_edged.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_lens_hard_edged.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_lens_hard_edged.json diff --git a/Regression/Checksum/benchmarks_json/plasma_lens_short.json b/Regression/Checksum/benchmarks_json/test_3d_plasma_lens_short.json similarity index 100% rename from Regression/Checksum/benchmarks_json/plasma_lens_short.json rename to Regression/Checksum/benchmarks_json/test_3d_plasma_lens_short.json diff --git a/Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json b/Regression/Checksum/benchmarks_json/test_3d_pml_psatd_dive_divb_cleaning.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_psatd_dive_divb_cleaning.json rename to Regression/Checksum/benchmarks_json/test_3d_pml_psatd_dive_divb_cleaning.json diff --git a/Regression/Checksum/benchmarks_json/point_of_contact_eb_3d.json b/Regression/Checksum/benchmarks_json/test_3d_point_of_contact_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/point_of_contact_eb_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_point_of_contact_eb.json diff --git a/Regression/Checksum/benchmarks_json/proton_boron_fusion_3d.json b/Regression/Checksum/benchmarks_json/test_3d_proton_boron_fusion.json similarity index 100% rename from Regression/Checksum/benchmarks_json/proton_boron_fusion_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_proton_boron_fusion.json diff --git a/Regression/Checksum/benchmarks_json/qed_breit_wheeler_3d.json b/Regression/Checksum/benchmarks_json/test_3d_qed_breit_wheeler.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_breit_wheeler_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_breit_wheeler.json diff --git a/Regression/Checksum/benchmarks_json/qed_quantum_sync_3d.json b/Regression/Checksum/benchmarks_json/test_3d_qed_quantum_sync.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_quantum_sync_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_quantum_sync.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger_1.json b/Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_1.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger_1.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_1.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger_2.json b/Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_2.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger_2.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_2.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger_3.json b/Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_3.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger_3.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_3.json diff --git a/Regression/Checksum/benchmarks_json/qed_schwinger_4.json b/Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_4.json similarity index 100% rename from Regression/Checksum/benchmarks_json/qed_schwinger_4.json rename to Regression/Checksum/benchmarks_json/test_3d_qed_schwinger_4.json diff --git a/Regression/Checksum/benchmarks_json/radiation_reaction.json b/Regression/Checksum/benchmarks_json/test_3d_radiation_reaction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/radiation_reaction.json rename to Regression/Checksum/benchmarks_json/test_3d_radiation_reaction.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags.json b/Regression/Checksum/benchmarks_json/test_3d_reduced_diags.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags.json rename to Regression/Checksum/benchmarks_json/test_3d_reduced_diags.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_heuristic.json b/Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_heuristic.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_heuristic.json rename to Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_heuristic.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers.json b/Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_timers.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers.json rename to Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_timers.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers_psatd.json b/Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_timers_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_load_balance_costs_timers_psatd.json rename to Regression/Checksum/benchmarks_json/test_3d_reduced_diags_load_balance_costs_timers_psatd.json diff --git a/Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json b/Regression/Checksum/benchmarks_json/test_3d_reduced_diags_single_precision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/reduced_diags_single_precision.json rename to Regression/Checksum/benchmarks_json/test_3d_reduced_diags_single_precision.json diff --git a/Regression/Checksum/benchmarks_json/relativistic_space_charge_initialization.json b/Regression/Checksum/benchmarks_json/test_3d_relativistic_space_charge_initialization.json similarity index 100% rename from Regression/Checksum/benchmarks_json/relativistic_space_charge_initialization.json rename to Regression/Checksum/benchmarks_json/test_3d_relativistic_space_charge_initialization.json diff --git a/Regression/Checksum/benchmarks_json/Python_restart_eb.json b/Regression/Checksum/benchmarks_json/test_3d_restart_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_restart_eb.json rename to Regression/Checksum/benchmarks_json/test_3d_restart_eb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/space_charge_initialization_3d.json b/Regression/Checksum/benchmarks_json/test_3d_space_charge_initialization.json similarity index 100% rename from Regression/Checksum/benchmarks_json/space_charge_initialization_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_space_charge_initialization.json diff --git a/Regression/Checksum/benchmarks_json/uniform_plasma_3d.json b/Regression/Checksum/benchmarks_json/test_3d_uniform_plasma.json similarity index 100% rename from Regression/Checksum/benchmarks_json/uniform_plasma_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_uniform_plasma.json diff --git a/Regression/Checksum/benchmarks_json/uniform_plasma_multiJ.json b/Regression/Checksum/benchmarks_json/test_3d_uniform_plasma_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/uniform_plasma_multiJ.json rename to Regression/Checksum/benchmarks_json/test_3d_uniform_plasma_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/vay_deposition_3d.json b/Regression/Checksum/benchmarks_json/test_3d_vay_deposition.json similarity index 100% rename from Regression/Checksum/benchmarks_json/vay_deposition_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_vay_deposition.json diff --git a/Regression/Checksum/benchmarks_json/btd_rz.json b/Regression/Checksum/benchmarks_json/test_rz_btd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/btd_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_btd.json diff --git a/Regression/Checksum/benchmarks_json/collision_rz.json b/Regression/Checksum/benchmarks_json/test_rz_collision.json similarity index 100% rename from Regression/Checksum/benchmarks_json/collision_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_collision.json diff --git a/Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_rz.json b/Regression/Checksum/benchmarks_json/test_rz_deuterium_tritium_fusion.json similarity index 100% rename from Regression/Checksum/benchmarks_json/deuterium_tritium_fusion_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_deuterium_tritium_fusion.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_rz.json b/Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz.json b/Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere_eb.json diff --git a/Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz_mr.json b/Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere_eb_mr.json similarity index 100% rename from Regression/Checksum/benchmarks_json/electrostatic_sphere_eb_rz_mr.json rename to Regression/Checksum/benchmarks_json/test_rz_electrostatic_sphere_eb_mr.json diff --git a/Regression/Checksum/benchmarks_json/embedded_boundary_diffraction.json b/Regression/Checksum/benchmarks_json/test_rz_embedded_boundary_diffraction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/embedded_boundary_diffraction.json rename to Regression/Checksum/benchmarks_json/test_rz_embedded_boundary_diffraction.json diff --git a/Regression/Checksum/benchmarks_json/flux_injection_rz.json b/Regression/Checksum/benchmarks_json/test_rz_flux_injection.json similarity index 100% rename from Regression/Checksum/benchmarks_json/flux_injection_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_flux_injection.json diff --git a/Regression/Checksum/benchmarks_json/galilean_rz_psatd.json b/Regression/Checksum/benchmarks_json/test_rz_galilean_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_rz_psatd.json rename to Regression/Checksum/benchmarks_json/test_rz_galilean_psatd.json diff --git a/Regression/Checksum/benchmarks_json/galilean_rz_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_rz_galilean_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_rz_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_rz_galilean_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/galilean_rz_psatd_current_correction_psb.json b/Regression/Checksum/benchmarks_json/test_rz_galilean_psatd_current_correction_psb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/galilean_rz_psatd_current_correction_psb.json rename to Regression/Checksum/benchmarks_json/test_rz_galilean_psatd_current_correction_psb.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_fluid_rz.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_fluid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_fluid_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_fluid.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_rz.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_multi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_multi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_rz_picmi.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_rz_picmi.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_picmi.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_current_correction.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd_current_correction.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_current_correction.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd_current_correction.json diff --git a/Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_multiJ.json b/Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd_multiJ.json similarity index 100% rename from Regression/Checksum/benchmarks_json/langmuir_multi_rz_psatd_multiJ.json rename to Regression/Checksum/benchmarks_json/test_rz_langmuir_multi_psatd_multiJ.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_rz.json b/Regression/Checksum/benchmarks_json/test_rz_laser_acceleration.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_laser_acceleration.json diff --git a/Regression/Checksum/benchmarks_json/laser_acceleration_rz_picmi.json b/Regression/Checksum/benchmarks_json/test_rz_laser_acceleration_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_acceleration_rz_picmi.json rename to Regression/Checksum/benchmarks_json/test_rz_laser_acceleration_picmi.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_rz_lasy_file.json b/Regression/Checksum/benchmarks_json/test_rz_laser_injection_from_RZ_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_rz_lasy_file.json rename to Regression/Checksum/benchmarks_json/test_rz_laser_injection_from_RZ_lasy_file.json diff --git a/Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_rz.json b/Regression/Checksum/benchmarks_json/test_rz_laser_injection_from_lasy_file.json similarity index 100% rename from Regression/Checksum/benchmarks_json/laser_injection_from_lasy_file_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_laser_injection_from_lasy_file.json diff --git a/Regression/Checksum/benchmarks_json/load_external_field_rz_grid.json b/Regression/Checksum/benchmarks_json/test_rz_load_external_field_grid.json similarity index 100% rename from Regression/Checksum/benchmarks_json/load_external_field_rz_grid.json rename to Regression/Checksum/benchmarks_json/test_rz_load_external_field_grid.json diff --git a/Regression/Checksum/benchmarks_json/load_external_field_rz_particles.json b/Regression/Checksum/benchmarks_json/test_rz_load_external_field_particles.json similarity index 100% rename from Regression/Checksum/benchmarks_json/load_external_field_rz_particles.json rename to Regression/Checksum/benchmarks_json/test_rz_load_external_field_particles.json diff --git a/Regression/Checksum/benchmarks_json/magnetostatic_eb_rz_picmi.json b/Regression/Checksum/benchmarks_json/test_rz_magnetostatic_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/magnetostatic_eb_rz_picmi.json rename to Regression/Checksum/benchmarks_json/test_rz_magnetostatic_eb_picmi.json diff --git a/Regression/Checksum/benchmarks_json/multi_J_rz_psatd.json b/Regression/Checksum/benchmarks_json/test_rz_multiJ_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/multi_J_rz_psatd.json rename to Regression/Checksum/benchmarks_json/test_rz_multiJ_psatd.json diff --git a/Regression/Checksum/benchmarks_json/ohm_solver_em_modes_rz_picmi.json b/Regression/Checksum/benchmarks_json/test_rz_ohm_solver_em_modes_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/ohm_solver_em_modes_rz_picmi.json rename to Regression/Checksum/benchmarks_json/test_rz_ohm_solver_em_modes_picmi.json diff --git a/Regression/Checksum/benchmarks_json/particle_boundary_interaction_picmi.json b/Regression/Checksum/benchmarks_json/test_rz_particle_boundary_interaction_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/particle_boundary_interaction_picmi.json rename to Regression/Checksum/benchmarks_json/test_rz_particle_boundary_interaction_picmi.json diff --git a/Regression/Checksum/benchmarks_json/pml_psatd_rz.json b/Regression/Checksum/benchmarks_json/test_rz_pml_psatd.json similarity index 100% rename from Regression/Checksum/benchmarks_json/pml_psatd_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_pml_psatd.json diff --git a/Regression/Checksum/benchmarks_json/point_of_contact_eb_rz.json b/Regression/Checksum/benchmarks_json/test_rz_point_of_contact_eb.json similarity index 100% rename from Regression/Checksum/benchmarks_json/point_of_contact_eb_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_point_of_contact_eb.json diff --git a/Regression/Checksum/benchmarks_json/scraping.json b/Regression/Checksum/benchmarks_json/test_rz_scraping.json similarity index 100% rename from Regression/Checksum/benchmarks_json/scraping.json rename to Regression/Checksum/benchmarks_json/test_rz_scraping.json diff --git a/Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json b/Regression/Checksum/benchmarks_json/test_rz_silver_mueller_z.json similarity index 100% rename from Regression/Checksum/benchmarks_json/silver_mueller_rz_z.json rename to Regression/Checksum/benchmarks_json/test_rz_silver_mueller_z.json diff --git a/Regression/Checksum/benchmarks_json/spacecraft_charging.json b/Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging.json similarity index 100% rename from Regression/Checksum/benchmarks_json/spacecraft_charging.json rename to Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging.json From 5a2e449700c3fbbaba73d228ebbb301ebee64f77 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 21 Aug 2024 22:01:22 -0700 Subject: [PATCH 106/167] Fix broken tests --- Examples/CMakeLists.txt | 17 ++++++++--------- .../capacitive_discharge/analysis_2d.py | 2 +- .../inputs_test_2d_background_mcc_picmi.py | 4 ---- Examples/Tests/implicit/analysis_1d.py | 4 ++-- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 8aaa30e40d4..9b3ccfe66ff 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -72,17 +72,16 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) - #file(GLOB TEST_FILES "${INPUTS_DIR}/inputs*" "${INPUTS_DIR}/*.py") - #file(COPY ${TEST_FILES} DESTINATION ${THIS_WORKING_DIR}) - # copy test input files to run directory get_filename_component(INPUTS_PATH ${inputs} REALPATH BASE_DIR "${CMAKE_BINARYDIR}") - file(COPY ${INPUTS_PATH} DESTINATION ${THIS_WORKING_DIR}) - # copy base input files to run directory get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) - set(INPUTS_BASE ${INPUTS_DIR}/inputs_base_${SD}) - if(EXISTS ${INPUTS_BASE}) - file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) - endif() + # copy base input files to run directory + file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") + file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) + # copy test input file to run directory + file(COPY ${INPUTS_PATH} DESTINATION ${THIS_WORKING_DIR}) + # for restart tests, copy input file of original test (without "_restart" suffix) + string(REPLACE "_restart" "" INPUTS_PATH_NORESTART ${INPUTS_PATH}) + file(COPY ${INPUTS_PATH_NORESTART} DESTINATION ${THIS_WORKING_DIR}) set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py index 21f5c7714c4..e9782fabe23 100755 --- a/Examples/Physics_applications/capacitive_discharge/analysis_2d.py +++ b/Examples/Physics_applications/capacitive_discharge/analysis_2d.py @@ -14,5 +14,5 @@ import checksumAPI my_check = checksumAPI.evaluate_checksum( - "background_mcc", "Python_background_mcc_plt000050", do_particles=True, rtol=5e-3 + "test_2d_background_mcc", "diags/diag1000050", do_particles=True, rtol=5e-3 ) diff --git a/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py b/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py index 094a9cc8881..7879239d5ce 100755 --- a/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py +++ b/Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py @@ -311,16 +311,12 @@ def solve(self): particle_diag = picmi.ParticleDiagnostic( name="diag1", period=diagnostic_intervals, - write_dir=".", - warpx_file_prefix="Python_background_mcc_plt", ) field_diag = picmi.FieldDiagnostic( name="diag1", grid=grid, period=diagnostic_intervals, data_list=["rho_electrons", "rho_he_ions"], - write_dir=".", - warpx_file_prefix="Python_background_mcc_plt", ) ########################## diff --git a/Examples/Tests/implicit/analysis_1d.py b/Examples/Tests/implicit/analysis_1d.py index 40edea66024..bbbbb8db9b2 100755 --- a/Examples/Tests/implicit/analysis_1d.py +++ b/Examples/Tests/implicit/analysis_1d.py @@ -30,9 +30,9 @@ max_delta_E = np.abs(delta_E).max() test_name = os.path.split(os.getcwd())[1] -if re.match("semi_implicit_picard_1d", test_name): +if re.match("test_1d_semi_implicit_picard", test_name): tolerance_rel = 2.5e-5 -elif re.match("theta_implicit_picard_1d", test_name): +elif re.match("test_1d_theta_implicit_picard", test_name): # This case should have near machine precision conservation of energy tolerance_rel = 1.0e-14 From 2567497843cafb1edf18806bfdb938f99aef740d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 22 Aug 2024 09:38:08 -0700 Subject: [PATCH 107/167] Fix style checks --- .github/workflows/source/inputsNotTested | 20 ++++-------- .../workflows/source/wrongFileNameInExamples | 32 +++++++++++-------- .../automated_test_1_uniform_rest_32ppc | 1 - .../automated_test_2_uniform_rest_1ppc | 1 - .../automated_test_3_uniform_drift_4ppc | 1 - .../automated_test_4_labdiags_2ppc | 1 - .../automated_test_5_loadimbalance | 1 - .../automated_test_6_output_2ppc | 1 - 8 files changed, 26 insertions(+), 32 deletions(-) delete mode 120000 Examples/Tests/performance_tests/automated_test_1_uniform_rest_32ppc delete mode 120000 Examples/Tests/performance_tests/automated_test_2_uniform_rest_1ppc delete mode 120000 Examples/Tests/performance_tests/automated_test_3_uniform_drift_4ppc delete mode 120000 Examples/Tests/performance_tests/automated_test_4_labdiags_2ppc delete mode 120000 Examples/Tests/performance_tests/automated_test_5_loadimbalance delete mode 120000 Examples/Tests/performance_tests/automated_test_6_output_2ppc diff --git a/.github/workflows/source/inputsNotTested b/.github/workflows/source/inputsNotTested index 1b2df281022..a1cd256e504 100755 --- a/.github/workflows/source/inputsNotTested +++ b/.github/workflows/source/inputsNotTested @@ -8,20 +8,18 @@ ok=0 # all calls to add_warpx_test(...) in CMakeLists.txt files registered_tests=$(grep -h -R -A5 "add_warpx_test" Examples/ | grep Examples) +# FIXME we should exclude tests whose line starts with '#' (test commented out) -# go through each input file: C++ inputs or PICMI Python +# go through each input file for file in $(find Examples -type f) do # Name of file without path filename=$(basename $file) - # If file is an input file - if [[ ${filename:0:6 } =~ inputs ]] || - [[ ${filename:0:12} =~ PICMI_inputs ]] + # If file is a test input file + if [[ ${filename:0:11 } =~ inputs_test ]] then - cr=$'$' - file_cr="$file$cr" # Search file name in test list - if [[ "${registered_tests,,}" != *"${file_cr}"* ]] + if [[ "${registered_tests}" != *"${file}"* ]] then echo "$file is not tested!" ok=1 @@ -32,12 +30,8 @@ done if [ $ok -ne 0 ] then echo "" - echo "All files in Examples that start with one of" - echo " - inputs" - echo " - PICMI_inputs" - echo "must have an automated test." - echo "Please add a test in Regression/WarpX-tests.ini" - echo "for all files listed above." + echo "All files in Examples/ starting with 'inputs_test' must have an automated test." + echo "Please add a test in the corresponding CMakeLists.txt for all files listed above." fi exit $ok diff --git a/.github/workflows/source/wrongFileNameInExamples b/.github/workflows/source/wrongFileNameInExamples index aa92777b4c0..5660b99119d 100755 --- a/.github/workflows/source/wrongFileNameInExamples +++ b/.github/workflows/source/wrongFileNameInExamples @@ -14,13 +14,19 @@ files=() for pathtofile in $(find Examples -type f) do file=$(basename $pathtofile) - if [[ ${file:0:6 } != inputs ]] && - [[ ${file:0:12} != PICMI_inputs ]] && - [[ ${file:0:8 } != analysis ]] && - [[ ${file: -4} != yaml ]] && - [[ ${file:0:4 } != plot ]] && - [[ ${file:0:6 } != README ]] && - [[ ${file:0:10} != CMakeLists ]] + if [[ ${file:0:14} != inputs_base_1d ]] && + [[ ${file:0:14} != inputs_base_2d ]] && + [[ ${file:0:14} != inputs_base_3d ]] && + [[ ${file:0:14} != inputs_base_rz ]] && + [[ ${file:0:14} != inputs_test_1d ]] && + [[ ${file:0:14} != inputs_test_2d ]] && + [[ ${file:0:14} != inputs_test_3d ]] && + [[ ${file:0:14} != inputs_test_rz ]] && + [[ ${file:0:8 } != analysis ]] && + [[ ${file: -4} != yaml ]] && + [[ ${file:0:4 } != plot ]] && + [[ ${file:0:6 } != README ]] && + [[ ${file:0:10} != CMakeLists ]] then files+=($file) echo "$pathtofile does not have a proper name!" @@ -32,12 +38,12 @@ if [ $ok -ne 0 ] then echo "" echo "Files in Examples/ must start with one of:" - echo " - inputs : for WarpX input files" - echo " - PICMI_inputs : for PICMI-compliant input scripts" - echo " - analysis : for scripts testing the accuracy of a test" - echo " - *.yaml : for third-party input, e.g. Ascent in situ visualization" - echo " - README : for readme files" - echo " - CMakeLists : for CMake files" + echo " - inputs_base_<1d;2d;3d;rz>: for base input files" + echo " - inputs_test_<1d;2d;3d;rz>: for test input files" + echo " - analysis : for analysis scripts" + echo " - *.yaml : for third-party inputs, e.g., Ascent in-situ visualization" + echo " - README : for README files" + echo " - CMakeLists : for CMake files" echo "" echo "Please rename the file(s) to comply, or move to another folder" fi diff --git a/Examples/Tests/performance_tests/automated_test_1_uniform_rest_32ppc b/Examples/Tests/performance_tests/automated_test_1_uniform_rest_32ppc deleted file mode 120000 index 169abb79fde..00000000000 --- a/Examples/Tests/performance_tests/automated_test_1_uniform_rest_32ppc +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_1_uniform_rest_32ppc \ No newline at end of file diff --git a/Examples/Tests/performance_tests/automated_test_2_uniform_rest_1ppc b/Examples/Tests/performance_tests/automated_test_2_uniform_rest_1ppc deleted file mode 120000 index 5f6c6d2ed5d..00000000000 --- a/Examples/Tests/performance_tests/automated_test_2_uniform_rest_1ppc +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_2_uniform_rest_1ppc \ No newline at end of file diff --git a/Examples/Tests/performance_tests/automated_test_3_uniform_drift_4ppc b/Examples/Tests/performance_tests/automated_test_3_uniform_drift_4ppc deleted file mode 120000 index 0fe17ba03cb..00000000000 --- a/Examples/Tests/performance_tests/automated_test_3_uniform_drift_4ppc +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_3_uniform_drift_4ppc \ No newline at end of file diff --git a/Examples/Tests/performance_tests/automated_test_4_labdiags_2ppc b/Examples/Tests/performance_tests/automated_test_4_labdiags_2ppc deleted file mode 120000 index 1e67353c400..00000000000 --- a/Examples/Tests/performance_tests/automated_test_4_labdiags_2ppc +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_4_labdiags_2ppc \ No newline at end of file diff --git a/Examples/Tests/performance_tests/automated_test_5_loadimbalance b/Examples/Tests/performance_tests/automated_test_5_loadimbalance deleted file mode 120000 index 40734b2fe9b..00000000000 --- a/Examples/Tests/performance_tests/automated_test_5_loadimbalance +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_5_loadimbalance \ No newline at end of file diff --git a/Examples/Tests/performance_tests/automated_test_6_output_2ppc b/Examples/Tests/performance_tests/automated_test_6_output_2ppc deleted file mode 120000 index 4be041eb91e..00000000000 --- a/Examples/Tests/performance_tests/automated_test_6_output_2ppc +++ /dev/null @@ -1 +0,0 @@ -../../../Tools/PerformanceTests/automated_test_6_output_2ppc \ No newline at end of file From 5ce42e185fa6e51d8ebe7eec24f1f70aae6654e0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 22 Aug 2024 16:22:08 -0700 Subject: [PATCH 108/167] WarpX_CI: Cleanup After Run --- CMakeLists.txt | 2 ++ Examples/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69fb6031755..fa0e609ce7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ set_default_install_dirs() include(CMakeDependentOption) option(WarpX_APP "Build the WarpX executable application" ON) option(WarpX_ASCENT "Ascent in situ diagnostics" OFF) +option(WarpX_CI "This is a CI run" OFF) option(WarpX_EB "Embedded boundary support" OFF) option(WarpX_LIB "Build WarpX as a library" OFF) option(WarpX_MPI "Multi-node support (message-passing)" ON) @@ -195,6 +196,7 @@ endif() # this defined the variable BUILD_TESTING which is ON by default #include(CTest) +mark_as_advanced(WarpX_CI) # Dependencies ################################################################ diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 9b3ccfe66ff..00bf0119413 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -160,6 +160,18 @@ function(add_warpx_test set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") endif() + # CI: cleanup directly after run + if(WarpX_CI) + add_test( + NAME ${name}.cleanup + COMMAND ${CMAKE_COMMAND} -E rm -rf ${THIS_WORKING_DIR} + ) + set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") + if(analysis) + set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.analysis") + endif() + endif() + endfunction() # Add tests (alphabetical order) ############################################## From 7d4828658da0b5cfe7862329675e4f5dbab377bb Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 22 Aug 2024 16:22:23 -0700 Subject: [PATCH 109/167] Fix: CTest independent of PWD/CWD Can run now from any working dir --- Examples/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 00bf0119413..00086a7cbbf 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -72,7 +72,8 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) - get_filename_component(INPUTS_PATH ${inputs} REALPATH BASE_DIR "${CMAKE_BINARYDIR}") + # input directory + get_filename_component(INPUTS_PATH ${WarpX_SOURCE_DIR}/${inputs} REALPATH) get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) # copy base input files to run directory file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") From e68415ae95eef385be640e22bb1239b128d1e982 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 22 Aug 2024 17:38:57 -0700 Subject: [PATCH 110/167] Support CLI Args, Prep Script, Robust Python Startup --- Examples/CMakeLists.txt | 41 +++++++++++----- .../beam_beam_collision/CMakeLists.txt | 1 + .../capacitive_discharge/CMakeLists.txt | 47 ++++++++++--------- .../laser_acceleration/CMakeLists.txt | 14 ++++++ .../laser_ion/CMakeLists.txt | 2 + .../plasma_acceleration/CMakeLists.txt | 8 ++++ .../plasma_mirror/CMakeLists.txt | 1 + .../spacecraft_charging/CMakeLists.txt | 1 + .../uniform_plasma/CMakeLists.txt | 3 ++ .../Tests/accelerator_lattice/CMakeLists.txt | 3 ++ Examples/Tests/boosted_diags/CMakeLists.txt | 1 + Examples/Tests/boundaries/CMakeLists.txt | 1 + Examples/Tests/btd_rz/CMakeLists.txt | 1 + .../collider_relevant_diags/CMakeLists.txt | 1 + Examples/Tests/collision/CMakeLists.txt | 6 +++ Examples/Tests/divb_cleaning/CMakeLists.txt | 1 + Examples/Tests/dive_cleaning/CMakeLists.txt | 2 + .../electrostatic_dirichlet_bc/CMakeLists.txt | 2 + .../Tests/electrostatic_sphere/CMakeLists.txt | 5 ++ .../electrostatic_sphere_eb/CMakeLists.txt | 5 ++ .../embedded_boundary_cube/CMakeLists.txt | 3 ++ .../CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + .../CMakeLists.txt | 2 + Examples/Tests/embedded_circle/CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + Examples/Tests/field_probe/CMakeLists.txt | 1 + Examples/Tests/flux_injection/CMakeLists.txt | 2 + Examples/Tests/gaussian_beam/CMakeLists.txt | 2 + Examples/Tests/implicit/CMakeLists.txt | 4 ++ .../Tests/initial_distribution/CMakeLists.txt | 1 + Examples/Tests/ion_stopping/CMakeLists.txt | 1 + Examples/Tests/ionization/CMakeLists.txt | 3 ++ Examples/Tests/langmuir/CMakeLists.txt | 35 ++++++++++++++ Examples/Tests/langmuir_fluids/CMakeLists.txt | 4 ++ Examples/Tests/larmor/CMakeLists.txt | 1 + Examples/Tests/laser_injection/CMakeLists.txt | 3 ++ .../laser_injection_from_file/CMakeLists.txt | 7 +++ Examples/Tests/laser_on_fine/CMakeLists.txt | 1 + .../Tests/load_external_field/CMakeLists.txt | 6 +++ .../Tests/magnetostatic_eb/CMakeLists.txt | 3 ++ .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 1 + .../Tests/nci_fdtd_stability/CMakeLists.txt | 2 + .../Tests/nci_psatd_stability/CMakeLists.txt | 17 +++++++ .../Tests/nodal_electrostatic/CMakeLists.txt | 1 + Examples/Tests/nuclear_fusion/CMakeLists.txt | 6 +++ .../Tests/ohm_solver_em_modes/CMakeLists.txt | 42 ++++++++--------- .../open_bc_poisson_solver/CMakeLists.txt | 1 + .../CMakeLists.txt | 1 + .../particle_boundary_process/CMakeLists.txt | 2 + .../particle_boundary_scrape/CMakeLists.txt | 2 + .../Tests/particle_data_python/CMakeLists.txt | 3 ++ .../particle_fields_diags/CMakeLists.txt | 2 + Examples/Tests/particle_pusher/CMakeLists.txt | 1 + .../particle_thermal_boundary/CMakeLists.txt | 1 + .../Tests/particles_in_pml/CMakeLists.txt | 4 ++ .../pass_mpi_communicator/CMakeLists.txt | 1 + Examples/Tests/pec/CMakeLists.txt | 3 ++ Examples/Tests/photon_pusher/CMakeLists.txt | 1 + Examples/Tests/plasma_lens/CMakeLists.txt | 5 ++ Examples/Tests/pml/CMakeLists.txt | 8 ++++ .../Tests/point_of_contact_eb/CMakeLists.txt | 2 + Examples/Tests/python_wrappers/CMakeLists.txt | 1 + Examples/Tests/qed/CMakeLists.txt | 10 ++++ .../Tests/radiation_reaction/CMakeLists.txt | 1 + Examples/Tests/reduced_diags/CMakeLists.txt | 5 ++ .../CMakeLists.txt | 1 + .../Tests/repelling_particles/CMakeLists.txt | 1 + Examples/Tests/resampling/CMakeLists.txt | 3 ++ Examples/Tests/restart/CMakeLists.txt | 8 ++++ Examples/Tests/rigid_injection/CMakeLists.txt | 2 + Examples/Tests/scraping/CMakeLists.txt | 2 + Examples/Tests/silver_mueller/CMakeLists.txt | 4 ++ Examples/Tests/single_particle/CMakeLists.txt | 1 + .../CMakeLists.txt | 2 + Examples/Tests/subcycling/CMakeLists.txt | 1 + Examples/Tests/vay_deposition/CMakeLists.txt | 2 + 77 files changed, 321 insertions(+), 58 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 00086a7cbbf..939578b7f1e 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -22,10 +22,10 @@ function(add_warpx_test dims nprocs eb + preparation inputs analysis output - # ${ARGV7} optional command line arguments for Python tests ) # cannot run MPI tests w/o MPI build if(NOT WarpX_MPI) @@ -73,16 +73,21 @@ function(add_warpx_test set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) # input directory - get_filename_component(INPUTS_PATH ${WarpX_SOURCE_DIR}/${inputs} REALPATH) - get_filename_component(INPUTS_DIR ${INPUTS_PATH} DIRECTORY) + get_filename_component(INPUTS_ALL ${WarpX_SOURCE_DIR}/${inputs} REALPATH) + # separate input filename and potentially added arguments + separate_arguments(INPUTS_FILE_ARGS UNIX_COMMAND PROGRAM "${INPUTS_ALL}") + list(GET INPUTS_FILE_ARGS 0 INPUTS_FILE) + list(SUBLIST INPUTS_FILE_ARGS 1 -1 INPUTS_ARGS) + list(JOIN INPUTS_FILE_ARGS " " INPUTS_FILE_ARGS) + get_filename_component(INPUTS_DIR ${INPUTS_FILE} DIRECTORY) # copy base input files to run directory file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) # copy test input file to run directory - file(COPY ${INPUTS_PATH} DESTINATION ${THIS_WORKING_DIR}) + file(COPY ${INPUTS_FILE} DESTINATION ${THIS_WORKING_DIR}) # for restart tests, copy input file of original test (without "_restart" suffix) - string(REPLACE "_restart" "" INPUTS_PATH_NORESTART ${INPUTS_PATH}) - file(COPY ${INPUTS_PATH_NORESTART} DESTINATION ${THIS_WORKING_DIR}) + string(REPLACE "_restart" "" INPUTS_FILE_NORESTART ${INPUTS_FILE}) + file(COPY ${INPUTS_FILE_NORESTART} DESTINATION ${THIS_WORKING_DIR}) set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} @@ -99,17 +104,13 @@ function(add_warpx_test # test run if(python) - set(command_line_args "") - if(${ARGC} GREATER 7) - set(command_line_args ${ARGV7}) - endif() add_test( NAME ${name}.run COMMAND ${THIS_MPI_TEST_EXE} ${THIS_Python_EXE} ${WarpX_SOURCE_DIR}/${inputs} - ${command_line_args} + ${INPUTS_FILE_ARGS} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) # FIXME Use helper function to handle Windows exceptions @@ -134,18 +135,32 @@ function(add_warpx_test $ ${WarpX_SOURCE_DIR}/${inputs} ${runtime_params} + ${INPUTS_FILE_ARGS} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) endif() set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") - # test analysis + # preparation and test analysis + set(THIS_Python_SCRIPT_EXE) + if(is_python OR WIN32) + set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) + endif() + if(preparation) + add_test( + NAME ${name}.preparation + COMMAND + ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${preparation} + WORKING_DIRECTORY ${THIS_WORKING_DIR} + ) + set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${name}.preparation") + endif() if(analysis) add_test( NAME ${name}.analysis COMMAND - ${WarpX_SOURCE_DIR}/${analysis} + ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${analysis} ${output} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) diff --git a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index 007f7cd2a84..004dfd90418 100644 --- a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 6904b3b88df..65d900233c4 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -1,34 +1,35 @@ # Add tests (alphabetical order) ############################################## # -# FIXME -#add_warpx_test( -# test_1d_background_mcc_picmi # name -# 1 # dims -# 2 # nprocs -# OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py # inputs -# Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis -# diags/diag1000050 # output -# "--test --pythonsolver" # optional command-line arguments -#) +add_warpx_test( + test_1d_background_mcc_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + OFF # preparation script + "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --pythonsolver" # inputs + Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis + diags/diag1000050 # output +) add_warpx_test( test_2d_background_mcc # name 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output ) -# FIXME +# FIXME: can we make this a single precision for now? #add_warpx_test( # test_2d_background_mcc_dp_psp # name # 2 # dims # 2 # nprocs # OFF # eb +# OFF # preparation script # Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output @@ -39,19 +40,19 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output ) -# FIXME -#add_warpx_test( -# test_1d_dsmc_picmi # name -# 1 # dims -# 2 # nprocs -# OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py # inputs -# Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis -# diags/diag1000050 # output -# "--test --dsmc" # optional command-line arguments -#) +add_warpx_test( + test_1d_dsmc_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + OFF # preparation script + "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test -dsmc" # inputs + Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis + diags/diag1000050 # output +) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index a0d372d0d49..348cce4f177 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output @@ -16,6 +17,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis diags/diag1040000 # output @@ -26,6 +28,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis diags/diag1000001 # output @@ -36,6 +39,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output @@ -46,6 +50,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output @@ -56,6 +61,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output @@ -66,6 +72,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output @@ -76,6 +83,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output @@ -86,6 +94,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output @@ -96,6 +105,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output @@ -106,6 +116,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -116,6 +127,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd # inputs Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis diags/diag1/ # output @@ -126,6 +138,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -136,6 +149,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection # inputs Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis diags/diag1000200 # output diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index bf670231ed4..3d4a844d609 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index 0675d0298f6..576fc0c0a30 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1001000 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -26,6 +28,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -36,6 +39,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output @@ -46,6 +50,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000005 # output @@ -56,6 +61,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000025 # output @@ -66,6 +72,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -76,6 +83,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index f9a87cf65cd..019ed703934 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index 448451fecb0..e6098540785 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -7,6 +7,7 @@ add_warpx_test( RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py # inputs Examples/Physics_applications/spacecraft_charging/analysis.py # analysis diags/diag1/ # output diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index c42122ce06b..2052649fb2c 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index 0b0eb8dce14..fcb248c94ea 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 23ac9ed35c8..58b65e09bb1 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index 9b0dd97c3f9..65eca2f73e5 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/boundaries/inputs_test_3d_particle_boundaries # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 09fea2365ea..3ebdb4eaf33 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/btd_rz/inputs_test_rz_btd # inputs Examples/Tests/btd_rz/analysis.py # analysis diags/diag1000289 # output diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index e78ae64cc7d..50967c284de 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 8d2e733a93a..bb40c1d1008 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_1d_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_3d_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output @@ -26,6 +28,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_rz_collision # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_3d_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis diags/diag1000150 # output @@ -46,6 +50,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_2d_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output @@ -56,6 +61,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 9ab75023ae2..80baa7d42f5 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 1ad5745d63f..02373992082 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 9dc477076ed..3515f6fbc09 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index c7106e3cb8f..db14ee2853a 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output @@ -46,6 +50,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 3bf54e37229..6f4ffd7bdc1 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output @@ -19,6 +20,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -31,6 +33,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000002 # output @@ -43,6 +46,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output @@ -55,6 +59,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 13f2a45b454..42890eca7e5 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output @@ -19,6 +20,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output @@ -31,6 +33,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index 23eea586627..6a8906c5af8 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index f6b6af5561f..0fdd7b2e6e4 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index ffae709bdb4..c6966f5d346 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 @@ -19,6 +20,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index c37db535a7a..23f4daaacdd 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle # inputs Examples/Tests/embedded_circle/analysis.py # analysis diags/diag1000011 diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index bb96eae6551..f0cf6f1d9b4 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index 692c5bbabde..812a3827d23 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/field_probe/inputs_test_2d_field_probe # inputs Examples/Tests/field_probe/analysis.py # analysis diags/diag1000544 # output diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 5b63282681e..56fa064a1a0 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/flux_injection/inputs_test_3d_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output @@ -16,6 +17,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/flux_injection/inputs_test_rz_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 87c08e1bf69..442400fe657 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam # inputs Examples/Tests/gaussian_beam/analysis.py # analysis diags/diag1000000 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index bcf79702c66..02993f69221 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output @@ -16,6 +17,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output @@ -26,6 +28,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output @@ -36,6 +39,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 1b71500b099..e5aaac545cc 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution # inputs Examples/Tests/initial_distribution/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index ce2467b1ae1..f09ef77f2fd 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping # inputs Examples/Tests/ion_stopping/analysis.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index e51727b8909..d7aec70ee4c 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_boost # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1000420 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_lab # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output @@ -26,6 +28,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index ee5081d9721..a10922bee2f 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_1d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -26,6 +28,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -36,6 +39,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -47,6 +51,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -58,6 +63,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -68,6 +74,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -79,6 +86,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -91,6 +99,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -103,6 +112,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -115,6 +125,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -127,6 +138,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -139,6 +151,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -151,6 +164,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -163,6 +177,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -176,6 +191,7 @@ endif() # 2 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output @@ -188,6 +204,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output @@ -199,6 +216,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -209,6 +227,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -219,6 +238,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -230,6 +250,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -242,6 +263,7 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -254,6 +276,7 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -266,6 +289,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -278,6 +302,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -290,6 +315,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -302,6 +328,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -314,6 +341,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -326,6 +354,7 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -338,6 +367,7 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output @@ -349,6 +379,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -359,6 +390,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output @@ -370,6 +402,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -382,6 +415,7 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output @@ -394,6 +428,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 74490f7a7ff..40c46cc91c5 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output @@ -36,6 +39,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index b168fdd96c2..ca64395d7e5 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/larmor/inputs_test_2d_larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index 972a6aa9591..e7bfbcd6050 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/laser_injection/inputs_test_1d_laser_injection # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/laser_injection/inputs_test_2d_laser_injection # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/laser_injection/inputs_test_3d_laser_injection # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1000020 # output diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index c4a11ec34bf..a49a993dde9 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -7,6 +7,7 @@ # 2 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis # diags/diag1000250 # output @@ -18,6 +19,7 @@ # 1 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis # diags/diag1000250 # output @@ -29,6 +31,7 @@ # 1 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs # Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis # diags/diag1000250 # output @@ -40,6 +43,7 @@ # 2 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis # diags/diag1000250 # output @@ -51,6 +55,7 @@ # 3 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis # diags/diag1000250 # output @@ -62,6 +67,7 @@ # RZ # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis # diags/diag1000250 # output @@ -73,6 +79,7 @@ # RZ # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis # diags/diag1000250 # output diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index e40b0c6aff3..50a3d7715c2 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index cb9e34d6348..a94fb0d0745 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output @@ -26,6 +28,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output @@ -36,6 +39,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output @@ -46,6 +50,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output @@ -56,6 +61,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index ec583210aff..128f5462c52 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -19,6 +20,7 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output @@ -31,6 +33,7 @@ if(WarpX_EB) RZ # dims 1 # nprocs ON # eb + OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py # inputs Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index b3b0716b18f..1bb8eb9fb91 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver # inputs Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index 8cb6e07e7d8..180a67172fa 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index fb4feee7beb..d22269e67a0 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -19,6 +20,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -31,6 +33,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -43,6 +46,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output @@ -55,6 +59,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -67,6 +72,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -79,6 +85,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -91,6 +98,7 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -103,6 +111,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output @@ -115,6 +124,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -127,6 +137,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -139,6 +150,7 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output @@ -151,6 +163,7 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -163,6 +176,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -175,6 +189,7 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output @@ -187,6 +202,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output @@ -199,6 +215,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ # inputs Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis diags/diag1000300 # output diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 66c18503aed..d2838ab4329 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver # inputs Examples/Tests/nodal_electrostatic/analysis.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 3883eb6b9da..e819bd4c58f 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -36,6 +39,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output @@ -46,6 +50,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output @@ -56,6 +61,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index 3aea0d29009..d9d3ce5293b 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -1,26 +1,24 @@ # Add tests (alphabetical order) ############################################## # -# FIXME -#add_warpx_test( -# test_1d_ohm_solver_em_modes_picmi # name -# 1 # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py # inputs -# Examples/Tests/ohm_solver_em_modes/analysis.py # analysis -# diags/field_diag000250 # output -# "--test --dim 1 --bdir z" # optional command-line arguments -#) +add_warpx_test( + test_1d_ohm_solver_em_modes_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + OFF # preparation script + "Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs + Examples/Tests/ohm_solver_em_modes/analysis.py # analysis + diags/field_diag000250 # output +) -# FIXME -#add_warpx_test( -# test_rz_ohm_solver_em_modes_picmi # name -# RZ # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py # inputs -# Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis -# diags/diag1000100 # output -# "--test" # optional command-line arguments -#) +add_warpx_test( + test_rz_ohm_solver_em_modes_picmi # name + RZ # dims + 2 # nprocs + OFF # eb + OFF # preparation script + "Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs + Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis + diags/diag1000100 # output +) diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index 024e4bd09c3..ebbd708f771 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index c6ddf107a0d..cfb9905ba87 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index c4ee9a96b1d..d9c9f59d97c 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption # inputs Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis diags/diag1000060 # output @@ -18,6 +19,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py # inputs Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 083b597703c..6f727d97f61 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output @@ -19,6 +20,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index c8b7d15031b..9b469e3af26 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs Examples/Tests/particle_data_python/analysis.py # analysis diags/diag1000010 # output @@ -27,6 +29,7 @@ add_warpx_test( # 2 # dims # 2 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs # Examples/Tests/particle_data_python/analysis.py # analysis # diags/diag1000010 # output diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 9e0c4508560..350e582d52a 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis diags/diag1000200 # output @@ -17,6 +18,7 @@ add_warpx_test( # 3 # dims # 2 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags_single_precision # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index 6ebde2d60bd..3e54d32a862 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher # inputs Examples/Tests/particle_pusher/analysis.py # analysis diags/diag1010000 # output diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index d89d585701b..030f735fa80 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary # inputs Examples/Tests/particle_thermal_boundary/analysis.py # analysis diags/diag1002000 # output diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index dcbb5bb3d9b..f929a468b0f 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000180 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000300 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000120 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000200 # output diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index 72780916f2e..f7d517442be 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -7,6 +7,7 @@ # 2 # dims # 2 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs # Examples/Tests/pass_mpi_communicator/analysis.py # analysis # diags/diag1000010 # output diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index 3e16d6300f3..52b264ee3bf 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_field # inputs Examples/Tests/pec/analysis_pec.py # analysis diags/diag1000125 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_field_mr # inputs Examples/Tests/pec/analysis_pec_mr.py # analysis diags/diag1000125 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_particle # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index af523dfa70c..c74ccf97222 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher # inputs Examples/Tests/photon_pusher/analysis.py # analysis diags/diag1000050 # output diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index aa032641d52..2db865861d2 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output @@ -46,6 +50,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index d27d7cd0be7..a5b610fcd1b 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output @@ -19,6 +20,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output @@ -30,6 +32,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_ckc # inputs Examples/Tests/pml/analysis_pml_ckc.py # analysis diags/diag1000300 # output @@ -40,6 +43,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_galilean # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output @@ -50,6 +54,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_psatd # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output @@ -60,6 +65,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output @@ -70,6 +76,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_yee # inputs Examples/Tests/pml/analysis_pml_yee.py # analysis diags/diag1000300 # output @@ -80,6 +87,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index 9ce0c8769aa..4d5cc1a51b4 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output @@ -19,6 +20,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index 2cd383c156e..d73e9fb20d3 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index f43ea8cfe4a..1269cbaee35 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output @@ -46,6 +50,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output @@ -56,6 +61,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output @@ -66,6 +72,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output @@ -76,6 +83,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output @@ -86,6 +94,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output @@ -96,6 +105,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index b604727d607..d62c62b4094 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction # inputs Examples/Tests/radiation_reaction/analysis.py # analysis diags/diag1000064 # output diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index 1ff9936f428..547a1381e87 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags # inputs Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis diags/diag1000200 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output @@ -26,6 +28,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output @@ -36,6 +39,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output @@ -47,6 +51,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index b2f5096c0ec..97f0d992c6c 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization # inputs Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index 8abae86e5f0..c2cfe8a5b0e 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles # inputs Examples/Tests/repelling_particles/analysis.py # analysis diags/diag1000200 # output diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index 392cae16eab..ddfb9c953f3 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/resampling/inputs_test_2d_leveling_thinning # inputs Examples/Tests/resampling/analysis.py # analysis diags/diag1000008 # output @@ -16,6 +17,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output @@ -26,6 +28,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 6383f57bf4b..21d5a6e61bb 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -17,6 +18,7 @@ add_warpx_test( # 2 # dims # 1 # nprocs # OFF # eb +# OFF # preparation script # Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000010 # output @@ -27,6 +29,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -37,6 +40,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -48,6 +52,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -60,6 +65,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -72,6 +78,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output @@ -84,6 +91,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index a53f9c968c6..c000669ac3b 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis diags/diag1000001 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis diags/diag1000289 # output diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index 7033dcc4a85..db61d5242c6 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/scraping/inputs_test_rz_scraping # inputs Examples/Tests/scraping/analysis_rz.py # analysis diags/diag1000037 # output @@ -19,6 +20,7 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb + OFF # preparation script Examples/Tests/scraping/inputs_test_rz_scraping_filter # inputs Examples/Tests/scraping/analysis_rz_filter.py # analysis diags/diag1000037 # output diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index cc8e7742752..d6d50516645 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output @@ -16,6 +17,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output @@ -26,6 +28,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output @@ -36,6 +39,7 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index a8a7cce807a..8ef8e64c6fc 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/single_particle/inputs_test_2d_bilinear_filter # inputs Examples/Tests/single_particle/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index 080bb471b75..9b2054b2cd9 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output @@ -16,6 +17,7 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index 5b14edfae17..e74a2f31943 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -6,6 +6,7 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/subcycling/inputs_test_2d_subcycling_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000250 # output diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index dd72be5dbf2..3c1592faa63 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -7,6 +7,7 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000050 # output @@ -19,6 +20,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb + OFF # preparation script Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000025 # output From 5e652841cba48b2bc371b0c26c387a88ece88bdf Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:11:58 -0700 Subject: [PATCH 111/167] Compile tests with `-DWarpX_CI=ON` on Azure --- .azure-pipelines.yml | 2 +- CMakeLists.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 852f4afd5c7..daa3b01763b 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -150,7 +150,7 @@ jobs: df -h # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" - cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} + cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} -DWarpX_CI=ON # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa0e609ce7c..f3dc1f81e7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,7 +74,6 @@ set_default_install_dirs() include(CMakeDependentOption) option(WarpX_APP "Build the WarpX executable application" ON) option(WarpX_ASCENT "Ascent in situ diagnostics" OFF) -option(WarpX_CI "This is a CI run" OFF) option(WarpX_EB "Embedded boundary support" OFF) option(WarpX_LIB "Build WarpX as a library" OFF) option(WarpX_MPI "Multi-node support (message-passing)" ON) @@ -89,6 +88,10 @@ option(WarpX_QED_TABLE_GEN "QED table generation (requires PICSAR and Boost)" option(WarpX_QED_TOOLS "Build external tool to generate QED lookup tables (requires PICSAR and Boost)" OFF) +# Advanced option to flag automated CI runs +option(WarpX_CI "This is a CI run" OFF) +mark_as_advanced(WarpX_CI) + set(WarpX_DIMS_VALUES 1 2 3 RZ) set(WarpX_DIMS 3 CACHE STRING "Simulation dimensionality <1;2;3;RZ>") list(REMOVE_DUPLICATES WarpX_DIMS) @@ -196,7 +199,6 @@ endif() # this defined the variable BUILD_TESTING which is ON by default #include(CTest) -mark_as_advanced(WarpX_CI) # Dependencies ################################################################ @@ -797,7 +799,6 @@ endif() # if(BUILD_TESTING) enable_testing() - if(WarpX_APP OR WarpX_PYTHON) add_subdirectory(Examples) endif() From 2271c6b6b2165d88d42367f80688ac795ee5e45e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:13:04 -0700 Subject: [PATCH 112/167] Fix typo in CMakeLists.txt --- Examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 939578b7f1e..3bd040acb21 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -144,7 +144,7 @@ function(add_warpx_test # preparation and test analysis set(THIS_Python_SCRIPT_EXE) - if(is_python OR WIN32) + if(python OR WIN32) set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) endif() if(preparation) From 38cbfca63a396487378837ebe5c04d7afd383fb5 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:14:56 -0700 Subject: [PATCH 113/167] Fix tests dependency cycle --- Examples/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3bd040acb21..a1f86db0f6b 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -176,15 +176,15 @@ function(add_warpx_test set_property(TEST ${name}.analysis APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}") endif() - # CI: cleanup directly after run + # CI: remove test directory after run if(WarpX_CI) add_test( NAME ${name}.cleanup COMMAND ${CMAKE_COMMAND} -E rm -rf ${THIS_WORKING_DIR} ) - set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") + set_property(TEST ${name}.cleanup APPEND PROPERTY DEPENDS "${name}.run") if(analysis) - set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.analysis") + set_property(TEST ${name}.cleanup APPEND PROPERTY DEPENDS "${name}.analysis") endif() endif() From 436c323433fdc95c9265f57bece7d4f8cd97bc0b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:16:13 -0700 Subject: [PATCH 114/167] Fix indentation in CMakeLists.txt --- Examples/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index a1f86db0f6b..a36a1b36e3d 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -149,10 +149,10 @@ function(add_warpx_test endif() if(preparation) add_test( - NAME ${name}.preparation - COMMAND - ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${preparation} - WORKING_DIRECTORY ${THIS_WORKING_DIR} + NAME ${name}.preparation + COMMAND + ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${preparation} + WORKING_DIRECTORY ${THIS_WORKING_DIR} ) set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${name}.preparation") endif() From 21bff3b0d0d13b8ecb1386be1c7b9e58a28fde4b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:32:44 -0700 Subject: [PATCH 115/167] Clean up CMakeLists.txt --- Examples/CMakeLists.txt | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index a36a1b36e3d..6fb5921aaec 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -33,11 +33,6 @@ function(add_warpx_test return() endif() - ## do not run no-MPI tests w/ MPI build - #if(NOT mpi AND WarpX_MPI) - # return() - #endif() - # cannot run EB tests w/o EB build if(eb AND NOT WarpX_EB) message(WARNING "cannot run EB tests without EB build") @@ -72,23 +67,33 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) - # input directory get_filename_component(INPUTS_ALL ${WarpX_SOURCE_DIR}/${inputs} REALPATH) - # separate input filename and potentially added arguments + + # separate input file (full path) and optional command-line arguments separate_arguments(INPUTS_FILE_ARGS UNIX_COMMAND PROGRAM "${INPUTS_ALL}") + + # get input file (full path) list(GET INPUTS_FILE_ARGS 0 INPUTS_FILE) + + # get optional command-line arguments list(SUBLIST INPUTS_FILE_ARGS 1 -1 INPUTS_ARGS) list(JOIN INPUTS_FILE_ARGS " " INPUTS_FILE_ARGS) - get_filename_component(INPUTS_DIR ${INPUTS_FILE} DIRECTORY) + + # get input file's directory + get_filename_component(INPUTS_DIR INPUTS_FILE DIRECTORY) + # copy base input files to run directory file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) + # copy test input file to run directory file(COPY ${INPUTS_FILE} DESTINATION ${THIS_WORKING_DIR}) + # for restart tests, copy input file of original test (without "_restart" suffix) string(REPLACE "_restart" "" INPUTS_FILE_NORESTART ${INPUTS_FILE}) file(COPY ${INPUTS_FILE_NORESTART} DESTINATION ${THIS_WORKING_DIR}) + # set MPI executable set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} ${MPI_ALLOW_ROOT} @@ -97,6 +102,7 @@ function(add_warpx_test ${MPIEXEC_PREFLAGS} ) + # set Python executable set(THIS_Python_EXE) if(python) set(THIS_Python_EXE ${Python_EXECUTABLE}) @@ -109,8 +115,8 @@ function(add_warpx_test COMMAND ${THIS_MPI_TEST_EXE} ${THIS_Python_EXE} - ${WarpX_SOURCE_DIR}/${inputs} - ${INPUTS_FILE_ARGS} + ${INPUTS_FILE} + ${INPUTS_ARGS} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) # FIXME Use helper function to handle Windows exceptions @@ -133,20 +139,22 @@ function(add_warpx_test COMMAND ${THIS_MPI_TEST_EXE} $ - ${WarpX_SOURCE_DIR}/${inputs} + ${INPUTS_FILE} ${runtime_params} - ${INPUTS_FILE_ARGS} + ${INPUTS_ARGS} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) endif() + # run all tests with 1 OpenMP thread by default set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") - # preparation and test analysis set(THIS_Python_SCRIPT_EXE) if(python OR WIN32) set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) endif() + + # preparation if(preparation) add_test( NAME ${name}.preparation @@ -154,8 +162,11 @@ function(add_warpx_test ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${preparation} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) + # test run depends on test preparation set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${name}.preparation") endif() + + # test analysis if(analysis) add_test( NAME ${name}.analysis @@ -182,8 +193,10 @@ function(add_warpx_test NAME ${name}.cleanup COMMAND ${CMAKE_COMMAND} -E rm -rf ${THIS_WORKING_DIR} ) + # test cleanup depends on test run set_property(TEST ${name}.cleanup APPEND PROPERTY DEPENDS "${name}.run") if(analysis) + # test cleanup depends on test analysis set_property(TEST ${name}.cleanup APPEND PROPERTY DEPENDS "${name}.analysis") endif() endif() From 412c5b8b49f4be63d39869b1641e58ede6ebe8cf Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 11:48:52 -0700 Subject: [PATCH 116/167] Fix Clang pywarpx build --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1b3f491a487..881e641e5fd 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -210,7 +210,7 @@ jobs: cmake -S . -B build \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWarpX_APP=OFF \ + #-DWarpX_APP=OFF \ -DWarpX_FFT=ON \ -DWarpX_PYTHON=ON \ -DWarpX_QED_TABLE_GEN=ON From 33b69d6573a6c812e1df187b51c3f8a9653183bf Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 13:35:03 -0700 Subject: [PATCH 117/167] Fix bug in CMakeLists.txt --- Examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 6fb5921aaec..ab54dacd657 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -80,7 +80,7 @@ function(add_warpx_test list(JOIN INPUTS_FILE_ARGS " " INPUTS_FILE_ARGS) # get input file's directory - get_filename_component(INPUTS_DIR INPUTS_FILE DIRECTORY) + get_filename_component(INPUTS_DIR ${INPUTS_FILE} DIRECTORY) # copy base input files to run directory file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") From c71c906d96531c0aa8fa86e121cc17042b3de9f0 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 21:01:33 -0700 Subject: [PATCH 118/167] Cleanup --- Examples/Tests/restart/CMakeLists.txt | 4 ++-- ...ts_picmi.py => inputs_test_2d_runtime_components_picmi.py} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Examples/Tests/restart/{inputs_test_2d_restart_runtime_components_picmi.py => inputs_test_2d_runtime_components_picmi.py} (100%) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 21d5a6e61bb..1e3d438d48a 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -14,12 +14,12 @@ add_warpx_test( # FIXME #add_warpx_test( -# test_2d_restart_runtime_components_picmi # name +# test_2d_runtime_components_picmi # name # 2 # dims # 1 # nprocs # OFF # eb # OFF # preparation script -# Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py # inputs +# Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000010 # output #) diff --git a/Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py b/Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py similarity index 100% rename from Examples/Tests/restart/inputs_test_2d_restart_runtime_components_picmi.py rename to Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py From f067dd3a6cf2e271b2ec7eeae6ef83dac579211d Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 23 Aug 2024 21:19:48 -0700 Subject: [PATCH 119/167] Rewrite style checks in Python, cleanup --- .github/workflows/source.yml | 6 +- .github/workflows/source/check_inputs.py | 80 +++++++++++++++++++ .../{README.rst => README} | 0 .../{README.rst => README} | 0 .../laser_acceleration/{README.rst => README} | 0 .../laser_ion/{README.rst => README} | 0 .../{README.rst => README} | 0 .../plasma_mirror/{README.rst => README} | 0 .../uniform_plasma/{README.rst => README} | 0 .../gaussian_beam/{README.rst => README} | 0 ..._test_2d_parabolic_channel_initialization} | 0 .../Tests/langmuir/{README.rst => README} | 0 .../{README.rst => README} | 0 .../{README.rst => README} | 0 ...2d_ohm_law_solver_landau_damping_picmi.py} | 0 .../{README.rst => README} | 0 ..._test_1d_ohm_law_solver_ion_beam_picmi.py} | 0 .../{README.rst => README} | 0 ...law_solver_magnetic_reconnection_picmi.py} | 0 Examples/Tests/pml/CMakeLists.txt | 4 +- ...start_eb.py => inputs_test_3d_eb_picmi.py} | 0 ..._2d_parabolic_channel_initialization.json} | 0 22 files changed, 84 insertions(+), 6 deletions(-) create mode 100755 .github/workflows/source/check_inputs.py rename Examples/Physics_applications/beam_beam_collision/{README.rst => README} (100%) rename Examples/Physics_applications/capacitive_discharge/{README.rst => README} (100%) rename Examples/Physics_applications/laser_acceleration/{README.rst => README} (100%) rename Examples/Physics_applications/laser_ion/{README.rst => README} (100%) rename Examples/Physics_applications/plasma_acceleration/{README.rst => README} (100%) rename Examples/Physics_applications/plasma_mirror/{README.rst => README} (100%) rename Examples/Physics_applications/uniform_plasma/{README.rst => README} (100%) rename Examples/Tests/gaussian_beam/{README.rst => README} (100%) rename Examples/Tests/initial_plasma_profile/{inputs => inputs_test_2d_parabolic_channel_initialization} (100%) rename Examples/Tests/langmuir/{README.rst => README} (100%) rename Examples/Tests/ohm_solver_em_modes/{README.rst => README} (100%) rename Examples/Tests/ohm_solver_ion_Landau_damping/{README.rst => README} (100%) rename Examples/Tests/ohm_solver_ion_Landau_damping/{PICMI_inputs.py => inputs_test_2d_ohm_law_solver_landau_damping_picmi.py} (100%) rename Examples/Tests/ohm_solver_ion_beam_instability/{README.rst => README} (100%) rename Examples/Tests/ohm_solver_ion_beam_instability/{PICMI_inputs.py => inputs_test_1d_ohm_law_solver_ion_beam_picmi.py} (100%) rename Examples/Tests/ohm_solver_magnetic_reconnection/{README.rst => README} (100%) rename Examples/Tests/ohm_solver_magnetic_reconnection/{PICMI_inputs.py => inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py} (100%) rename Examples/Tests/restart_eb/{PICMI_inputs_restart_eb.py => inputs_test_3d_eb_picmi.py} (100%) rename Regression/Checksum/benchmarks_json/{test_2d_parabolic_channel_initialization_single_precision.json => test_2d_parabolic_channel_initialization.json} (100%) diff --git a/.github/workflows/source.yml b/.github/workflows/source.yml index a1c29416b3e..143be1971fb 100644 --- a/.github/workflows/source.yml +++ b/.github/workflows/source.yml @@ -25,10 +25,8 @@ jobs: run: .github/workflows/source/hasTabs - name: End-of-Line whitespaces run: .github/workflows/source/hasEOLwhiteSpace - - name: Proper file names in Examples - run: .github/workflows/source/wrongFileNameInExamples - - name: Examples are tested - run: .github/workflows/source/inputsNotTested + - name: Check test input files + run: .github/workflows/source/check_inputs.py - name: Check that the test matrix for CI includes all tests run: .github/workflows/source/test_ci_matrix.sh - name: Doxygen diff --git a/.github/workflows/source/check_inputs.py b/.github/workflows/source/check_inputs.py new file mode 100755 index 00000000000..9f45628ff17 --- /dev/null +++ b/.github/workflows/source/check_inputs.py @@ -0,0 +1,80 @@ +#! /usr/bin/env python3 + +import os +import re +import sys + +# mandatory prefixes for test names +testname_prefix = ["test_1d_", "test_2d_", "test_3d_", "test_rz_"] + +# collect all test names and test input filenames from CMakeLists.txt files +testnames = [] +testinputs = [] +# walk through all files under Examples/, including subdirectories +for dirpath, dirnames, filenames in os.walk(top="./Examples"): + # loop over CMakeLists.txt files + for name in [filename for filename in filenames if filename == "CMakeLists.txt"]: + filepath = os.path.join(dirpath, name) + # open CMakeLists.txt file + with open(filepath) as f: + # loop over lines of CMakeLists.txt + for line in f: + # strip leading whitespaces + line = line.lstrip() + # find lines where 'add_warpx_test' is called + if re.match("add_warpx_test", line): + # strip leading whitespaces, remove end-of-line comments + testname = next(f).lstrip().split(" ")[0] + testnames.append(testname) + # skip lines related to other function arguments + for _ in range(4): + next(f) + # strip leading whitespaces, remove end-of-line comments + testinput = next(f).lstrip().split(" ")[0] + # some Python input scripts are quoted + # to account for command-line arguments: + # strip initial quotation mark from string + if testinput.startswith('"'): + testinput = re.sub('"', "", testinput) + # extract filename from path + testinput = os.path.split(testinput)[1] + testinputs.append(testinput) + +# check consistency of test names and test input filenames +print("\nCheck that test names and input names are correct...") +wrong_testname = False +wrong_testinput = False +for testname, testinput in zip(testnames, testinputs): + if not testname.startswith(tuple(testname_prefix)): + print(f"Wrong test name: {testname}") + wrong_testname = True + if not testinput == f"inputs_{testname}" and not testinput.endswith("_picmi.py"): + print(f"Wrong input name: {testinput}") + wrong_testinput = True + +if wrong_testname: + print(f"NOTE: Test names must start with one of {testname_prefix}.") +if wrong_testinput: + print("NOTE: Test input names must start with 'inputs_' followed by the test name") + print(" (ending with the extension '.py' in the case of PICMI input scripts).") + +# check that all input files in Examples/ are tested +print("\nCheck that all test input files are tested...") +missing_input = False +# walk through all files under Examples/, including subdirectories +for dirpath, dirnames, filenames in os.walk(top="./Examples"): + # loop over files starting with "inputs_test_" + for name in [ + filename for filename in filenames if filename.startswith("inputs_test_") + ]: + if name not in testinputs: + print(f"Input not tested: {os.path.join(dirpath, name)}") + missing_input = True + +if missing_input: + print("NOTE: All test input files must be tested.\n") +else: + print() + +if wrong_testname or wrong_testinput or missing_input: + sys.exit("FAILED\n") diff --git a/Examples/Physics_applications/beam_beam_collision/README.rst b/Examples/Physics_applications/beam_beam_collision/README similarity index 100% rename from Examples/Physics_applications/beam_beam_collision/README.rst rename to Examples/Physics_applications/beam_beam_collision/README diff --git a/Examples/Physics_applications/capacitive_discharge/README.rst b/Examples/Physics_applications/capacitive_discharge/README similarity index 100% rename from Examples/Physics_applications/capacitive_discharge/README.rst rename to Examples/Physics_applications/capacitive_discharge/README diff --git a/Examples/Physics_applications/laser_acceleration/README.rst b/Examples/Physics_applications/laser_acceleration/README similarity index 100% rename from Examples/Physics_applications/laser_acceleration/README.rst rename to Examples/Physics_applications/laser_acceleration/README diff --git a/Examples/Physics_applications/laser_ion/README.rst b/Examples/Physics_applications/laser_ion/README similarity index 100% rename from Examples/Physics_applications/laser_ion/README.rst rename to Examples/Physics_applications/laser_ion/README diff --git a/Examples/Physics_applications/plasma_acceleration/README.rst b/Examples/Physics_applications/plasma_acceleration/README similarity index 100% rename from Examples/Physics_applications/plasma_acceleration/README.rst rename to Examples/Physics_applications/plasma_acceleration/README diff --git a/Examples/Physics_applications/plasma_mirror/README.rst b/Examples/Physics_applications/plasma_mirror/README similarity index 100% rename from Examples/Physics_applications/plasma_mirror/README.rst rename to Examples/Physics_applications/plasma_mirror/README diff --git a/Examples/Physics_applications/uniform_plasma/README.rst b/Examples/Physics_applications/uniform_plasma/README similarity index 100% rename from Examples/Physics_applications/uniform_plasma/README.rst rename to Examples/Physics_applications/uniform_plasma/README diff --git a/Examples/Tests/gaussian_beam/README.rst b/Examples/Tests/gaussian_beam/README similarity index 100% rename from Examples/Tests/gaussian_beam/README.rst rename to Examples/Tests/gaussian_beam/README diff --git a/Examples/Tests/initial_plasma_profile/inputs b/Examples/Tests/initial_plasma_profile/inputs_test_2d_parabolic_channel_initialization similarity index 100% rename from Examples/Tests/initial_plasma_profile/inputs rename to Examples/Tests/initial_plasma_profile/inputs_test_2d_parabolic_channel_initialization diff --git a/Examples/Tests/langmuir/README.rst b/Examples/Tests/langmuir/README similarity index 100% rename from Examples/Tests/langmuir/README.rst rename to Examples/Tests/langmuir/README diff --git a/Examples/Tests/ohm_solver_em_modes/README.rst b/Examples/Tests/ohm_solver_em_modes/README similarity index 100% rename from Examples/Tests/ohm_solver_em_modes/README.rst rename to Examples/Tests/ohm_solver_em_modes/README diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/README.rst b/Examples/Tests/ohm_solver_ion_Landau_damping/README similarity index 100% rename from Examples/Tests/ohm_solver_ion_Landau_damping/README.rst rename to Examples/Tests/ohm_solver_ion_Landau_damping/README diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/PICMI_inputs.py b/Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_law_solver_landau_damping_picmi.py similarity index 100% rename from Examples/Tests/ohm_solver_ion_Landau_damping/PICMI_inputs.py rename to Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_law_solver_landau_damping_picmi.py diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/README.rst b/Examples/Tests/ohm_solver_ion_beam_instability/README similarity index 100% rename from Examples/Tests/ohm_solver_ion_beam_instability/README.rst rename to Examples/Tests/ohm_solver_ion_beam_instability/README diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/PICMI_inputs.py b/Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_law_solver_ion_beam_picmi.py similarity index 100% rename from Examples/Tests/ohm_solver_ion_beam_instability/PICMI_inputs.py rename to Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_law_solver_ion_beam_picmi.py diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/README.rst b/Examples/Tests/ohm_solver_magnetic_reconnection/README similarity index 100% rename from Examples/Tests/ohm_solver_magnetic_reconnection/README.rst rename to Examples/Tests/ohm_solver_magnetic_reconnection/README diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/PICMI_inputs.py b/Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py similarity index 100% rename from Examples/Tests/ohm_solver_magnetic_reconnection/PICMI_inputs.py rename to Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index a5b610fcd1b..0b45d5ae0d8 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -7,7 +7,7 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script + OFF # preparation script Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output @@ -20,7 +20,7 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script + OFF # preparation script Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output diff --git a/Examples/Tests/restart_eb/PICMI_inputs_restart_eb.py b/Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py similarity index 100% rename from Examples/Tests/restart_eb/PICMI_inputs_restart_eb.py rename to Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py diff --git a/Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization_single_precision.json b/Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization_single_precision.json rename to Regression/Checksum/benchmarks_json/test_2d_parabolic_channel_initialization.json From cc96a48eb35d3916ed304965db24017cfcc4cb02 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Sat, 24 Aug 2024 21:29:54 -0700 Subject: [PATCH 120/167] Update Python script for inputs check --- .github/workflows/source/check_inputs.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/source/check_inputs.py b/.github/workflows/source/check_inputs.py index 9f45628ff17..11e4cce34ea 100755 --- a/.github/workflows/source/check_inputs.py +++ b/.github/workflows/source/check_inputs.py @@ -48,15 +48,21 @@ if not testname.startswith(tuple(testname_prefix)): print(f"Wrong test name: {testname}") wrong_testname = True + if "restart" in testname: + if not testname.endswith("_restart") and not testname.endswith("_restart.py"): + print(f"Wrong test name: {testname}") + wrong_testname = True if not testinput == f"inputs_{testname}" and not testinput.endswith("_picmi.py"): print(f"Wrong input name: {testinput}") wrong_testinput = True if wrong_testname: print(f"NOTE: Test names must start with one of {testname_prefix}.") + print(" Test names must end with '_restart' for restart tests") + print(" (with the extension '.py' in the case of PICMI input scripts).") if wrong_testinput: print("NOTE: Test input names must start with 'inputs_' followed by the test name") - print(" (ending with the extension '.py' in the case of PICMI input scripts).") + print(" (with the extension '.py' in the case of PICMI input scripts).") # check that all input files in Examples/ are tested print("\nCheck that all test input files are tested...") From df929ec431f4102eafdc928ac75387a75b550df6 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 10:19:06 -0700 Subject: [PATCH 121/167] Fix broken tests --- Examples/Tests/ion_stopping/analysis.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Examples/Tests/ion_stopping/analysis.py b/Examples/Tests/ion_stopping/analysis.py index 8f987740837..e343bd23fdd 100755 --- a/Examples/Tests/ion_stopping/analysis.py +++ b/Examples/Tests/ion_stopping/analysis.py @@ -12,7 +12,6 @@ # particle energies. import os -import re import sys import numpy as np @@ -30,13 +29,7 @@ tolerance = 1.0e-7 last_filename = sys.argv[1] - -# Remove trailing '/' from file name, if necessary -last_filename.rstrip("/") -# Find last iteration in file name, such as 'test_name_plt000001' (last_it = '000001') -last_it = re.search("\d+$", last_filename).group() -# Find output prefix in file name, such as 'test_name_plt000001' (prefix = 'test_name_plt') -prefix = last_filename[: -len(last_it)] +last_it = 10 def stopping_from_electrons(ne, Te, Zb, ion_mass): @@ -150,14 +143,14 @@ def stopping_from_ions(dt, ni, Ti, mi, Zi, Zb, ion_mass, ion_energy): ds = yt.load(last_filename) ad = ds.all_data() -dt = ds.current_time.to_value() / int(last_it) +dt = ds.current_time.to_value() / last_it # Step through the same number of time steps a_EE1 = EE1 a_EE2 = EE2 a_EE3 = EE3 a_EE4 = EE4 -for it in range(int(last_it)): +for it in range(last_it): dEdt1 = stopping_from_electrons(ne, Te, Zb, ion_mass12) a_EE1 *= np.exp(dEdt1 * dt) dEdt2 = stopping_from_electrons(ne2, Te2, Zb, ion_mass12) From 9857090c8f2c3440bbfa316c30ad8ab891ff9d2a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 26 Aug 2024 11:11:04 -0700 Subject: [PATCH 122/167] CTest: `add_warpx_test` with Dependent Test --- Examples/CMakeLists.txt | 43 +++++++----- .../beam_beam_collision/CMakeLists.txt | 2 +- .../capacitive_discharge/CMakeLists.txt | 10 +-- .../laser_acceleration/CMakeLists.txt | 28 ++++---- .../laser_ion/CMakeLists.txt | 4 +- .../plasma_acceleration/CMakeLists.txt | 16 ++--- .../plasma_mirror/CMakeLists.txt | 2 +- .../spacecraft_charging/CMakeLists.txt | 2 +- .../uniform_plasma/CMakeLists.txt | 6 +- .../Tests/accelerator_lattice/CMakeLists.txt | 6 +- Examples/Tests/boosted_diags/CMakeLists.txt | 2 +- Examples/Tests/boundaries/CMakeLists.txt | 2 +- Examples/Tests/btd_rz/CMakeLists.txt | 2 +- .../collider_relevant_diags/CMakeLists.txt | 2 +- Examples/Tests/collision/CMakeLists.txt | 12 ++-- Examples/Tests/divb_cleaning/CMakeLists.txt | 2 +- Examples/Tests/dive_cleaning/CMakeLists.txt | 4 +- .../electrostatic_dirichlet_bc/CMakeLists.txt | 4 +- .../Tests/electrostatic_sphere/CMakeLists.txt | 10 +-- .../electrostatic_sphere_eb/CMakeLists.txt | 10 +-- .../embedded_boundary_cube/CMakeLists.txt | 6 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 1 - .../CMakeLists.txt | 2 - .../CMakeLists.txt | 2 +- Examples/Tests/field_probe/CMakeLists.txt | 2 +- Examples/Tests/flux_injection/CMakeLists.txt | 4 +- Examples/Tests/gaussian_beam/CMakeLists.txt | 4 +- Examples/Tests/implicit/CMakeLists.txt | 8 +-- .../Tests/initial_distribution/CMakeLists.txt | 2 +- Examples/Tests/ion_stopping/CMakeLists.txt | 2 +- Examples/Tests/ionization/CMakeLists.txt | 6 +- Examples/Tests/langmuir/CMakeLists.txt | 70 +++++++++---------- Examples/Tests/langmuir_fluids/CMakeLists.txt | 8 +-- Examples/Tests/larmor/CMakeLists.txt | 2 +- Examples/Tests/laser_injection/CMakeLists.txt | 6 +- .../laser_injection_from_file/CMakeLists.txt | 14 ++-- Examples/Tests/laser_on_fine/CMakeLists.txt | 2 +- .../Tests/load_external_field/CMakeLists.txt | 12 ++-- .../Tests/magnetostatic_eb/CMakeLists.txt | 6 +- .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 2 +- .../Tests/nci_fdtd_stability/CMakeLists.txt | 4 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 34 ++++----- .../Tests/nodal_electrostatic/CMakeLists.txt | 2 +- Examples/Tests/nuclear_fusion/CMakeLists.txt | 12 ++-- .../Tests/ohm_solver_em_modes/CMakeLists.txt | 4 +- .../open_bc_poisson_solver/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../particle_boundary_process/CMakeLists.txt | 4 +- .../particle_boundary_scrape/CMakeLists.txt | 4 +- .../Tests/particle_data_python/CMakeLists.txt | 6 +- .../particle_fields_diags/CMakeLists.txt | 4 +- Examples/Tests/particle_pusher/CMakeLists.txt | 2 +- .../particle_thermal_boundary/CMakeLists.txt | 2 +- .../Tests/particles_in_pml/CMakeLists.txt | 8 +-- .../pass_mpi_communicator/CMakeLists.txt | 2 +- Examples/Tests/pec/CMakeLists.txt | 6 +- Examples/Tests/photon_pusher/CMakeLists.txt | 2 +- Examples/Tests/plasma_lens/CMakeLists.txt | 10 +-- Examples/Tests/pml/CMakeLists.txt | 16 ++--- .../Tests/point_of_contact_eb/CMakeLists.txt | 4 +- Examples/Tests/python_wrappers/CMakeLists.txt | 2 +- Examples/Tests/qed/CMakeLists.txt | 20 +++--- .../Tests/radiation_reaction/CMakeLists.txt | 2 +- Examples/Tests/reduced_diags/CMakeLists.txt | 10 +-- .../CMakeLists.txt | 2 +- .../Tests/repelling_particles/CMakeLists.txt | 2 +- Examples/Tests/resampling/CMakeLists.txt | 6 +- Examples/Tests/restart/CMakeLists.txt | 16 ++--- Examples/Tests/rigid_injection/CMakeLists.txt | 4 +- Examples/Tests/scraping/CMakeLists.txt | 4 +- Examples/Tests/silver_mueller/CMakeLists.txt | 8 +-- Examples/Tests/single_particle/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- Examples/Tests/subcycling/CMakeLists.txt | 2 +- Examples/Tests/vay_deposition/CMakeLists.txt | 4 +- 76 files changed, 279 insertions(+), 271 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index ab54dacd657..6f38b94d783 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -17,25 +17,34 @@ endif() # Add a WarpX test set (with sub-tests) # +# name: unique name of this test +# dims: 1,2,RZ,3 +# nprocs: 1 or 2 (maybe refactor later on to just depend on WarpX_MPI) +# eb: needs EB support? (temporary until runtime param) +# inputs: inputs file or PICMI script - WarpX_MPI decides on w/wo MPI +# analysis: analysis script - always run without MPI +# output: output file to analyze +# dependency: name of another test to run first +# function(add_warpx_test name dims nprocs eb - preparation inputs analysis output + dependency ) # cannot run MPI tests w/o MPI build - if(NOT WarpX_MPI) - message(WARNING "cannot run MPI tests without MPI build") + if(nprocs GREATER_EQUAL 2 AND NOT WarpX_MPI) + message(WARNING "${name}: cannot run MPI tests without MPI build") return() endif() # cannot run EB tests w/o EB build if(eb AND NOT WarpX_EB) - message(WARNING "cannot run EB tests without EB build") + message(WARNING "${name}: cannot run EB tests without EB build") return() endif() @@ -154,18 +163,6 @@ function(add_warpx_test set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) endif() - # preparation - if(preparation) - add_test( - NAME ${name}.preparation - COMMAND - ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${preparation} - WORKING_DIRECTORY ${THIS_WORKING_DIR} - ) - # test run depends on test preparation - set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${name}.preparation") - endif() - # test analysis if(analysis) add_test( @@ -201,6 +198,20 @@ function(add_warpx_test endif() endif() + # Do we depend on another test? + if(dependency) + # test run depends on another test being run and analyzed + if(TARGET ${dependency}.run) + set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.run") + endif() + if(TARGET ${dependency}.analysis) + set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.analysis") + endif() + # do not clean up dependent before we are done + if(TARGET ${dependency}.cleanup) + set_property(TEST ${dependency}.cleanup APPEND PROPERTY DEPENDS "${name}.cleanup") + endif() + endif() endfunction() # Add tests (alphabetical order) ############################################## diff --git a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index 004dfd90418..b0f6a0d0041 100644 --- a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 65d900233c4..c03ce3e5fd2 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --pythonsolver" # inputs Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis diags/diag1000050 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output + OFF # depend on this test ) # FIXME: can we make this a single precision for now? @@ -29,10 +29,10 @@ add_warpx_test( # 2 # dims # 2 # nprocs # OFF # eb -# OFF # preparation script # Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output +# OFF # depend on this test #) add_warpx_test( @@ -40,10 +40,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output + OFF # depend on this test ) add_warpx_test( @@ -51,8 +51,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test -dsmc" # inputs Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis diags/diag1000050 # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 348cce4f177..3c848543d68 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis diags/diag1040000 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -61,10 +61,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output + OFF # depend on this test ) add_warpx_test( @@ -72,10 +72,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output + OFF # depend on this test ) add_warpx_test( @@ -83,10 +83,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -94,10 +94,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -105,10 +105,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -116,10 +116,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -127,10 +127,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd # inputs Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -138,10 +138,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -149,8 +149,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection # inputs Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis diags/diag1000200 # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index 3d4a844d609..acdee6ea369 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index 576fc0c0a30..a0391de4065 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1001000 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000005 # output + OFF # depend on this test ) add_warpx_test( @@ -61,10 +61,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000025 # output + OFF # depend on this test ) add_warpx_test( @@ -72,10 +72,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -83,8 +83,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index 019ed703934..64dacc005ba 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output + OFF # depend on this test ) diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index e6098540785..2ff026fa083 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -7,9 +7,9 @@ add_warpx_test( RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py # inputs Examples/Physics_applications/spacecraft_charging/analysis.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index 2052649fb2c..aa8ab6102e2 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index fcb248c94ea..240c67ca159 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output + OFF # depend on this test ) diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 58b65e09bb1..2a0dba62fdf 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output + OFF # depend on this test ) diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index 65eca2f73e5..cd8551c0540 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/boundaries/inputs_test_3d_particle_boundaries # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output + OFF # depend on this test ) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 3ebdb4eaf33..653a9cccba3 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/btd_rz/inputs_test_rz_btd # inputs Examples/Tests/btd_rz/analysis.py # analysis diags/diag1000289 # output + OFF # depend on this test ) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index 50967c284de..cb5a0e759f8 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index bb40c1d1008..cea0b24db8a 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_1d_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_3d_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_rz_collision # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_3d_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis diags/diag1000150 # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_2d_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output + OFF # depend on this test ) add_warpx_test( @@ -61,8 +61,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output + OFF # depend on this test ) diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 80baa7d42f5..6f52fa62838 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output + OFF # depend on this test ) diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 02373992082..17158fae3ff 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output + OFF # depend on this test ) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 3515f6fbc09..880c04ec3a8 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output + OFF # depend on this test ) diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index db14ee2853a..0871daf34ad 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output + OFF # depend on this test ) add_warpx_test( @@ -50,8 +50,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output + OFF # depend on this test ) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 6f4ffd7bdc1..c4d390c7034 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() @@ -20,10 +20,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() @@ -33,10 +33,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000002 # output + OFF # depend on this test ) endif() @@ -46,10 +46,10 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() @@ -59,9 +59,9 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 42890eca7e5..6cab142ce54 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output + OFF # depend on this test ) endif() @@ -20,10 +20,10 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output + OFF # depend on this test ) endif() @@ -33,9 +33,9 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index 6a8906c5af8..a6ccef80042 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 0fdd7b2e6e4..f6b6af5561f 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -7,7 +7,6 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index c6966f5d346..ffae709bdb4 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -7,7 +7,6 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 @@ -20,7 +19,6 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index f0cf6f1d9b4..1ee2214a9ba 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output + OFF # depend on this test ) diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index 812a3827d23..bf2bbb6bd4f 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/field_probe/inputs_test_2d_field_probe # inputs Examples/Tests/field_probe/analysis.py # analysis diags/diag1000544 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 56fa064a1a0..14f9dd89696 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/flux_injection/inputs_test_3d_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/flux_injection/inputs_test_rz_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output + OFF # depend on this test ) diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 442400fe657..1f0b3d563ef 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam # inputs Examples/Tests/gaussian_beam/analysis.py # analysis diags/diag1000000 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 02993f69221..3275438ad28 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output + OFF # depend on this test ) add_warpx_test( @@ -39,8 +39,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output + OFF # depend on this test ) diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index e5aaac545cc..463ed7e54b8 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution # inputs Examples/Tests/initial_distribution/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index f09ef77f2fd..5461027af82 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping # inputs Examples/Tests/ion_stopping/analysis.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index d7aec70ee4c..3886530d828 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_boost # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1000420 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_lab # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output + OFF # depend on this test ) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index a10922bee2f..24597724e6f 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_1d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -51,10 +51,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -63,10 +63,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -74,10 +74,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -86,10 +86,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -99,10 +99,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -112,10 +112,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -125,10 +125,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -138,10 +138,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -151,10 +151,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -164,10 +164,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -177,10 +177,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -191,10 +191,10 @@ endif() # 2 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output +# OFF # depend on this test # ) #endif() @@ -204,10 +204,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -216,10 +216,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) add_warpx_test( @@ -227,10 +227,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) add_warpx_test( @@ -238,10 +238,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -250,10 +250,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -263,10 +263,10 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -276,10 +276,10 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -289,10 +289,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -302,10 +302,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -315,10 +315,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -328,10 +328,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -341,10 +341,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -354,10 +354,10 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -367,10 +367,10 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) endif() @@ -379,10 +379,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -390,10 +390,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -402,10 +402,10 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -415,10 +415,10 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() @@ -428,9 +428,9 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 40c46cc91c5..de53f6eb4b9 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output + OFF # depend on this test ) add_warpx_test( @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output + OFF # depend on this test ) diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index ca64395d7e5..3215918ad73 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/larmor/inputs_test_2d_larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index e7bfbcd6050..e191b94789e 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/laser_injection/inputs_test_1d_laser_injection # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/laser_injection/inputs_test_2d_laser_injection # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/laser_injection/inputs_test_3d_laser_injection # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1000020 # output + OFF # depend on this test ) diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index a49a993dde9..a3ab4392ea2 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -7,10 +7,10 @@ # 2 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -19,10 +19,10 @@ # 1 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -31,10 +31,10 @@ # 1 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs # Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -43,10 +43,10 @@ # 2 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -55,10 +55,10 @@ # 3 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -67,10 +67,10 @@ # RZ # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) # FIXME @@ -79,8 +79,8 @@ # RZ # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis # diags/diag1000250 # output +# OFF # depend on this test #) diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index 50a3d7715c2..170d31d1956 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output + OFF # depend on this test ) diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index a94fb0d0745..1227b0ec019 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -61,8 +61,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output + OFF # depend on this test ) diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index 128f5462c52..7e4cfdd37f3 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() @@ -20,10 +20,10 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() @@ -33,9 +33,9 @@ if(WarpX_EB) RZ # dims 1 # nprocs ON # eb - OFF # preparation script Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py # inputs Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index 1bb8eb9fb91..64d82fa68a1 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver # inputs Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index 180a67172fa..af18068371d 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output + OFF # depend on this test ) diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index d22269e67a0..8feacd9b759 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -20,10 +20,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -33,10 +33,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output + OFF # depend on this test ) endif() @@ -46,10 +46,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output + OFF # depend on this test ) endif() @@ -59,10 +59,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -72,10 +72,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -85,10 +85,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -98,10 +98,10 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -111,10 +111,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -124,10 +124,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output + OFF # depend on this test ) endif() @@ -137,10 +137,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output + OFF # depend on this test ) endif() @@ -150,10 +150,10 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output + OFF # depend on this test ) endif() @@ -163,10 +163,10 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -176,10 +176,10 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -189,10 +189,10 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output + OFF # depend on this test ) endif() @@ -202,10 +202,10 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output + OFF # depend on this test ) endif() @@ -215,9 +215,9 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ # inputs Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis diags/diag1000300 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index d2838ab4329..45bdb5c9f8f 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver # inputs Examples/Tests/nodal_electrostatic/analysis.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index e819bd4c58f..43b62ca491a 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -61,8 +61,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index d9d3ce5293b..2ad3b1ca519 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script "Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs Examples/Tests/ohm_solver_em_modes/analysis.py # analysis diags/field_diag000250 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script "Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis diags/diag1000100 # output + OFF # depend on this test ) diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index ebbd708f771..e919b4f27f2 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index cfb9905ba87..b8fddeca95c 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index d9c9f59d97c..a28bbf81d6c 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption # inputs Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis diags/diag1000060 # output + OFF # depend on this test ) endif() @@ -19,8 +19,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py # inputs Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis diags/diag1000010 # output + OFF # depend on this test ) diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 6f727d97f61..5bd5b0dce01 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output + OFF # depend on this test ) endif() @@ -20,9 +20,9 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index 9b469e3af26..e20b8efc898 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs Examples/Tests/particle_data_python/analysis.py # analysis diags/diag1000010 # output + OFF # depend on this test ) # FIXME @@ -29,8 +29,8 @@ add_warpx_test( # 2 # dims # 2 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs # Examples/Tests/particle_data_python/analysis.py # analysis # diags/diag1000010 # output +# OFF # depend on this test #) diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 350e582d52a..d69be3b2c9b 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis diags/diag1000200 # output + OFF # depend on this test ) # FIXME @@ -18,8 +18,8 @@ add_warpx_test( # 3 # dims # 2 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags_single_precision # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output +# OFF # depend on this test #) diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index 3e54d32a862..db82a5d2184 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher # inputs Examples/Tests/particle_pusher/analysis.py # analysis diags/diag1010000 # output + OFF # depend on this test ) diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index 030f735fa80..846c3c7e6fa 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary # inputs Examples/Tests/particle_thermal_boundary/analysis.py # analysis diags/diag1002000 # output + OFF # depend on this test ) diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index f929a468b0f..5d145300b3d 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000180 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000120 # output + OFF # depend on this test ) add_warpx_test( @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000200 # output + OFF # depend on this test ) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index f7d517442be..2e4714738f1 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -7,8 +7,8 @@ # 2 # dims # 2 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs # Examples/Tests/pass_mpi_communicator/analysis.py # analysis # diags/diag1000010 # output +# OFF # depend on this test #) diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index 52b264ee3bf..8ee719c581d 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_field # inputs Examples/Tests/pec/analysis_pec.py # analysis diags/diag1000125 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_field_mr # inputs Examples/Tests/pec/analysis_pec_mr.py # analysis diags/diag1000125 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pec/inputs_test_3d_pec_particle # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output + OFF # depend on this test ) diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index c74ccf97222..bc126fe4908 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher # inputs Examples/Tests/photon_pusher/analysis.py # analysis diags/diag1000050 # output + OFF # depend on this test ) diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index 2db865861d2..101028e27af 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output + OFF # depend on this test ) add_warpx_test( @@ -50,8 +50,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output + OFF # depend on this test ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 0b45d5ae0d8..6a41d77ce4a 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output + OFF # depend on this test ) endif() @@ -20,10 +20,10 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output + OFF # depend on this test ) endif() @@ -32,10 +32,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_ckc # inputs Examples/Tests/pml/analysis_pml_ckc.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -43,10 +43,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_galilean # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -54,10 +54,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_psatd # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -65,10 +65,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -76,10 +76,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_yee # inputs Examples/Tests/pml/analysis_pml_yee.py # analysis diags/diag1000300 # output + OFF # depend on this test ) add_warpx_test( @@ -87,8 +87,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output + OFF # depend on this test ) diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index 4d5cc1a51b4..f38f6dab9c9 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() @@ -20,9 +20,9 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index d73e9fb20d3..79e79062c43 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index 1269cbaee35..d8ddb523cbe 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output + OFF # depend on this test ) add_warpx_test( @@ -50,10 +50,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_2d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -61,10 +61,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output + OFF # depend on this test ) add_warpx_test( @@ -72,10 +72,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -83,10 +83,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -94,10 +94,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -105,8 +105,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index d62c62b4094..fdd47bb7e11 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction # inputs Examples/Tests/radiation_reaction/analysis.py # analysis diags/diag1000064 # output + OFF # depend on this test ) diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index 547a1381e87..edaa276c91c 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags # inputs Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis diags/diag1000200 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output + OFF # depend on this test ) add_warpx_test( @@ -39,10 +39,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -51,9 +51,9 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index 97f0d992c6c..6c269a797f3 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization # inputs Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index c2cfe8a5b0e..f831c9e1164 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles # inputs Examples/Tests/repelling_particles/analysis.py # analysis diags/diag1000200 # output + OFF # depend on this test ) diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index ddfb9c953f3..b94c99ae816 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/resampling/inputs_test_2d_leveling_thinning # inputs Examples/Tests/resampling/analysis.py # analysis diags/diag1000008 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output + OFF # depend on this test ) add_warpx_test( @@ -28,8 +28,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output + OFF # depend on this test ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 1e3d438d48a..20e7224fd63 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) # FIXME @@ -18,10 +18,10 @@ add_warpx_test( # 2 # dims # 1 # nprocs # OFF # eb -# OFF # preparation script # Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000010 # output +# OFF # depend on this test #) add_warpx_test( @@ -29,10 +29,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) add_warpx_test( @@ -40,10 +40,10 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) if(WarpX_FFT) @@ -52,10 +52,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) endif() @@ -65,10 +65,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) endif() @@ -78,10 +78,10 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) endif() @@ -91,9 +91,9 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index c000669ac3b..c5155c5ff09 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis diags/diag1000289 # output + OFF # depend on this test ) diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index db61d5242c6..0857c0827ab 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/scraping/inputs_test_rz_scraping # inputs Examples/Tests/scraping/analysis_rz.py # analysis diags/diag1000037 # output + OFF # depend on this test ) endif() @@ -20,9 +20,9 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/scraping/inputs_test_rz_scraping_filter # inputs Examples/Tests/scraping/analysis_rz_filter.py # analysis diags/diag1000037 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index d6d50516645..1475bc705f8 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output + OFF # depend on this test ) add_warpx_test( @@ -17,10 +17,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output + OFF # depend on this test ) add_warpx_test( @@ -28,10 +28,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output + OFF # depend on this test ) add_warpx_test( @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output + OFF # depend on this test ) diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 8ef8e64c6fc..e83f300387f 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/single_particle/inputs_test_2d_bilinear_filter # inputs Examples/Tests/single_particle/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index 9b2054b2cd9..5238ae7e12b 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -6,10 +6,10 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) add_warpx_test( @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output + OFF # depend on this test ) diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index e74a2f31943..9494a343bb1 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/subcycling/inputs_test_2d_subcycling_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000250 # output + OFF # depend on this test ) diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index 3c1592faa63..753dde9eeae 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -7,10 +7,10 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000050 # output + OFF # depend on this test ) endif() @@ -20,9 +20,9 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - OFF # preparation script Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000025 # output + OFF # depend on this test ) endif() From ffe04a316c01328bff9bd86844f9bdd8c213e994 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 11:22:30 -0700 Subject: [PATCH 123/167] Fix calls to `add_warpx_test` --- Examples/Tests/embedded_boundary_python_api/CMakeLists.txt | 3 ++- .../Tests/embedded_boundary_rotated_cube/CMakeLists.txt | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index f6b6af5561f..6eca8af496e 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -9,6 +9,7 @@ if(WarpX_EB) ON # eb Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis - diags/diag1000002 + diags/diag1000002 # output + OFF # depend on this test ) endif() diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index ffae709bdb4..7d6d2ad6fc9 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -9,7 +9,8 @@ if(WarpX_EB) ON # eb Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis - diags/diag1000068 + diags/diag1000068 # output + OFF # depend on this test ) endif() @@ -21,6 +22,7 @@ if(WarpX_EB) ON # eb Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis - diags/diag1000111 + diags/diag1000111 # output + OFF # depend on this test ) endif() From a3dae266132aa9c440676472f2cc638a75bffbd3 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 13:33:56 -0700 Subject: [PATCH 124/167] Fix restart tests --- Examples/CMakeLists.txt | 22 +++++++++---------- .../Tests/load_external_field/CMakeLists.txt | 4 ++-- Examples/Tests/pml/CMakeLists.txt | 4 ++-- Examples/Tests/restart/CMakeLists.txt | 6 ++--- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 6f38b94d783..fac3ff20760 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -20,11 +20,11 @@ endif() # name: unique name of this test # dims: 1,2,RZ,3 # nprocs: 1 or 2 (maybe refactor later on to just depend on WarpX_MPI) -# eb: needs EB support? (temporary until runtime param) -# inputs: inputs file or PICMI script - WarpX_MPI decides on w/wo MPI -# analysis: analysis script - always run without MPI -# output: output file to analyze -# dependency: name of another test to run first +# eb: needs EB support? (temporary until handled as runtime parameter) +# inputs: inputs file or PICMI script, WarpX_MPI decides w/ or w/o MPI +# analysis: analysis script, always run without MPI +# output: output file (dir) to analyze +# dependency: name of base test that must run first # function(add_warpx_test name @@ -200,15 +200,13 @@ function(add_warpx_test # Do we depend on another test? if(dependency) - # test run depends on another test being run and analyzed - if(TARGET ${dependency}.run) - set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.run") - endif() - if(TARGET ${dependency}.analysis) + # current test depends on dependency test run (and analysis) + set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.run") + if(analysis) set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.analysis") endif() - # do not clean up dependent before we are done - if(TARGET ${dependency}.cleanup) + if(WarpX_CI) + # do not clean up dependency test before current test is completed set_property(TEST ${dependency}.cleanup APPEND PROPERTY DEPENDS "${name}.cleanup") endif() endif() diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 1227b0ec019..002ac281aa1 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - OFF # depend on this test + test_rz_load_external_field_grid # depend on this test ) add_warpx_test( @@ -64,5 +64,5 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - OFF # depend on this test + test_rz_load_external_field_particles # depend on this test ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 6a41d77ce4a..6f013971436 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -68,7 +68,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - OFF # depend on this test + test_2d_pml_x_psatd # depend on this test ) add_warpx_test( @@ -90,5 +90,5 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - OFF # depend on this test + test_2d_pml_x_yee # depend on this test ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 20e7224fd63..af2874848bf 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -43,7 +43,7 @@ add_warpx_test( Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + test_3d_acceleration # depend on this test ) if(WarpX_FFT) @@ -68,7 +68,7 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + test_3d_acceleration_psatd # depend on this test ) endif() @@ -94,6 +94,6 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + test_3d_acceleration_psatd_time_avg # depend on this test ) endif() From 9ae006262489cdb0b2ad48fb5bf2a37eda97d11e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 13:39:44 -0700 Subject: [PATCH 125/167] Cleanup --- .../beam_beam_collision/CMakeLists.txt | 2 +- .../capacitive_discharge/CMakeLists.txt | 10 +-- .../laser_acceleration/CMakeLists.txt | 28 ++++---- .../laser_ion/CMakeLists.txt | 4 +- .../plasma_acceleration/CMakeLists.txt | 16 ++--- .../plasma_mirror/CMakeLists.txt | 2 +- .../spacecraft_charging/CMakeLists.txt | 2 +- .../uniform_plasma/CMakeLists.txt | 6 +- .../Tests/accelerator_lattice/CMakeLists.txt | 6 +- Examples/Tests/boosted_diags/CMakeLists.txt | 2 +- Examples/Tests/boundaries/CMakeLists.txt | 2 +- Examples/Tests/btd_rz/CMakeLists.txt | 2 +- .../collider_relevant_diags/CMakeLists.txt | 2 +- Examples/Tests/collision/CMakeLists.txt | 12 ++-- Examples/Tests/divb_cleaning/CMakeLists.txt | 2 +- Examples/Tests/dive_cleaning/CMakeLists.txt | 4 +- .../electrostatic_dirichlet_bc/CMakeLists.txt | 4 +- .../Tests/electrostatic_sphere/CMakeLists.txt | 10 +-- .../electrostatic_sphere_eb/CMakeLists.txt | 10 +-- .../embedded_boundary_cube/CMakeLists.txt | 6 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 2 +- Examples/Tests/field_probe/CMakeLists.txt | 2 +- Examples/Tests/flux_injection/CMakeLists.txt | 4 +- Examples/Tests/gaussian_beam/CMakeLists.txt | 4 +- Examples/Tests/implicit/CMakeLists.txt | 8 +-- .../Tests/initial_distribution/CMakeLists.txt | 2 +- Examples/Tests/ion_stopping/CMakeLists.txt | 2 +- Examples/Tests/ionization/CMakeLists.txt | 6 +- Examples/Tests/langmuir/CMakeLists.txt | 70 +++++++++---------- Examples/Tests/langmuir_fluids/CMakeLists.txt | 8 +-- Examples/Tests/larmor/CMakeLists.txt | 2 +- Examples/Tests/laser_injection/CMakeLists.txt | 6 +- .../laser_injection_from_file/CMakeLists.txt | 14 ++-- Examples/Tests/laser_on_fine/CMakeLists.txt | 2 +- .../Tests/load_external_field/CMakeLists.txt | 12 ++-- .../Tests/magnetostatic_eb/CMakeLists.txt | 6 +- .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 2 +- .../Tests/nci_fdtd_stability/CMakeLists.txt | 4 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 34 ++++----- .../Tests/nodal_electrostatic/CMakeLists.txt | 2 +- Examples/Tests/nuclear_fusion/CMakeLists.txt | 12 ++-- .../Tests/ohm_solver_em_modes/CMakeLists.txt | 4 +- .../open_bc_poisson_solver/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../particle_boundary_process/CMakeLists.txt | 4 +- .../particle_boundary_scrape/CMakeLists.txt | 4 +- .../Tests/particle_data_python/CMakeLists.txt | 6 +- .../particle_fields_diags/CMakeLists.txt | 4 +- Examples/Tests/particle_pusher/CMakeLists.txt | 2 +- .../particle_thermal_boundary/CMakeLists.txt | 2 +- .../Tests/particles_in_pml/CMakeLists.txt | 8 +-- .../pass_mpi_communicator/CMakeLists.txt | 2 +- Examples/Tests/pec/CMakeLists.txt | 6 +- Examples/Tests/photon_pusher/CMakeLists.txt | 2 +- Examples/Tests/plasma_lens/CMakeLists.txt | 10 +-- Examples/Tests/pml/CMakeLists.txt | 16 ++--- .../Tests/point_of_contact_eb/CMakeLists.txt | 4 +- Examples/Tests/python_wrappers/CMakeLists.txt | 2 +- Examples/Tests/qed/CMakeLists.txt | 20 +++--- .../Tests/radiation_reaction/CMakeLists.txt | 2 +- Examples/Tests/reduced_diags/CMakeLists.txt | 10 +-- .../CMakeLists.txt | 2 +- .../Tests/repelling_particles/CMakeLists.txt | 2 +- Examples/Tests/resampling/CMakeLists.txt | 6 +- Examples/Tests/restart/CMakeLists.txt | 16 ++--- Examples/Tests/rigid_injection/CMakeLists.txt | 4 +- Examples/Tests/scraping/CMakeLists.txt | 4 +- Examples/Tests/silver_mueller/CMakeLists.txt | 8 +-- Examples/Tests/single_particle/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +- Examples/Tests/subcycling/CMakeLists.txt | 2 +- Examples/Tests/vay_deposition/CMakeLists.txt | 4 +- 75 files changed, 255 insertions(+), 255 deletions(-) diff --git a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index b0f6a0d0041..3831cb3dde8 100644 --- a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index c03ce3e5fd2..752058f55c7 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --pythonsolver" # inputs Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) # FIXME: can we make this a single precision for now? @@ -32,7 +32,7 @@ add_warpx_test( # Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_dp_psp # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000050 # output -# OFF # depend on this test +# OFF # dependency #) add_warpx_test( @@ -43,7 +43,7 @@ add_warpx_test( Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py # inputs Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -54,5 +54,5 @@ add_warpx_test( "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test -dsmc" # inputs Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 3c848543d68..75711172e27 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis diags/diag1040000 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted # inputs Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,7 +64,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -75,7 +75,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -86,7 +86,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -97,7 +97,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -108,7 +108,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -119,7 +119,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -130,7 +130,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd # inputs Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -141,7 +141,7 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -152,5 +152,5 @@ add_warpx_test( Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection # inputs Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index acdee6ea369..6d5a9e19f32 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py # inputs Examples/analysis_default_openpmd_regression.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index a0391de4065..737f7d242b7 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1001000 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted # inputs Examples/analysis_default_regression.py # analysis diags/diag1000005 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,7 +64,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000025 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -75,7 +75,7 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -86,5 +86,5 @@ add_warpx_test( Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index 64dacc005ba..410565fb781 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index 2ff026fa083..fdc97d581e6 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -10,6 +10,6 @@ add_warpx_test( Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py # inputs Examples/Physics_applications/spacecraft_charging/analysis.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index aa8ab6102e2..d9fbf237fca 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index 240c67ca159..ecb48d3339e 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving # inputs Examples/Tests/accelerator_lattice/analysis.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 2a0dba62fdf..a66a59005ba 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd # inputs Examples/Tests/boosted_diags/analysis.py # analysis diags/diag1000003 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index cd8551c0540..47b5b97fcf0 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/boundaries/inputs_test_3d_particle_boundaries # inputs Examples/Tests/boundaries/analysis.py # analysis diags/diag1000008 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 653a9cccba3..8bff1cc7d9a 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/btd_rz/inputs_test_rz_btd # inputs Examples/Tests/btd_rz/analysis.py # analysis diags/diag1000289 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index cb5a0e759f8..899deaa22d7 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics # inputs Examples/Tests/collider_relevant_diags/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index cea0b24db8a..e2d5e7dc95f 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/collision/inputs_test_1d_collision_z # inputs Examples/Tests/collision/analysis_collision_1d.py # analysis diags/diag1000600 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/collision/inputs_test_3d_collision_iso # inputs Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/collision/inputs_test_rz_collision # inputs Examples/Tests/collision/analysis_collision_rz.py # analysis diags/diag1000150 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/collision/inputs_test_3d_collision_xyz # inputs Examples/Tests/collision/analysis_collision_3d.py # analysis diags/diag1000150 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Tests/collision/inputs_test_2d_collision_xz # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,5 +64,5 @@ add_warpx_test( Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py # inputs Examples/Tests/collision/analysis_collision_2d.py # analysis diags/diag1000150 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 6f52fa62838..036c9e7500a 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning # inputs Examples/Tests/divb_cleaning/analysis.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 17158fae3ff..7a4709e7d40 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning # inputs Examples/Tests/dive_cleaning/analysis.py # analysis diags/diag1000128 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index 880c04ec3a8..d922aaa25a0 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py # inputs Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 0871daf34ad..49f48aeb88a 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,5 +53,5 @@ add_warpx_test( Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere # inputs Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index c4d390c7034..36940aaaa42 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,7 +23,7 @@ if(WarpX_EB) Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -36,7 +36,7 @@ if(WarpX_EB) Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -49,7 +49,7 @@ if(WarpX_EB) Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -62,6 +62,6 @@ if(WarpX_EB) Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr # inputs Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 6cab142ce54..55f7079588a 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis diags/diag1000114 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,7 +23,7 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -36,6 +36,6 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic # inputs Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis diags/diag1000208 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index a6ccef80042..e14620c6108 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction # inputs Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 6eca8af496e..6433a306565 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs Examples/Tests/embedded_boundary_python_api/analysis.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 7d6d2ad6fc9..5c94ffdde92 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis diags/diag1000068 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,6 +23,6 @@ if(WarpX_EB) Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis diags/diag1000111 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index 1ee2214a9ba..70a43b0ba63 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma # inputs Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index bf2bbb6bd4f..580702d9bbb 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_EB) Examples/Tests/field_probe/inputs_test_2d_field_probe # inputs Examples/Tests/field_probe/analysis.py # analysis diags/diag1000544 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 14f9dd89696..3a7bee3c3e9 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/flux_injection/inputs_test_3d_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/flux_injection/inputs_test_rz_flux_injection # inputs Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis diags/diag1000120 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 1f0b3d563ef..430ecc4137c 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam # inputs Examples/Tests/gaussian_beam/analysis.py # analysis diags/diag1000000 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 3275438ad28..165678456d0 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard # inputs Examples/Tests/implicit/analysis_1d.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,5 +42,5 @@ add_warpx_test( Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 463ed7e54b8..69c9ab3eb7d 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution # inputs Examples/Tests/initial_distribution/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index 5461027af82..74cf2d2f9e3 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping # inputs Examples/Tests/ion_stopping/analysis.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index 3886530d828..93f97f76039 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/ionization/inputs_test_2d_ionization_boost # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1000420 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/ionization/inputs_test_2d_ionization_lab # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py # inputs Examples/Tests/ionization/analysis.py # analysis diags/diag1001600 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 24597724e6f..fe5450b6798 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_1d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_1d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) if(WarpX_FFT) @@ -54,7 +54,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -66,7 +66,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -77,7 +77,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) if(WarpX_FFT) @@ -89,7 +89,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -102,7 +102,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -115,7 +115,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -128,7 +128,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -141,7 +141,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -154,7 +154,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -167,7 +167,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -180,7 +180,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -194,7 +194,7 @@ endif() # Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs # Examples/Tests/langmuir/analysis_2d.py # analysis # diags/diag1000080 # output -# OFF # depend on this test +# OFF # dependency # ) #endif() @@ -207,7 +207,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -219,7 +219,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_3d_langmuir_multi # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -230,7 +230,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -241,7 +241,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) if(WarpX_FFT) @@ -253,7 +253,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -266,7 +266,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -279,7 +279,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -292,7 +292,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -305,7 +305,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -318,7 +318,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -331,7 +331,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -344,7 +344,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -357,7 +357,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -370,7 +370,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs Examples/Tests/langmuir/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -382,7 +382,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_rz_langmuir_multi # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -393,7 +393,7 @@ add_warpx_test( Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) if(WarpX_FFT) @@ -405,7 +405,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -418,7 +418,7 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -431,6 +431,6 @@ if(WarpX_FFT) Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ # inputs Examples/Tests/langmuir/analysis_rz.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index de53f6eb4b9..464335fb49d 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_1d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_2d.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_3d.py # analysis diags/diag1000040 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,5 +42,5 @@ add_warpx_test( Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid # inputs Examples/Tests/langmuir_fluids/analysis_rz.py # analysis diags/diag1000080 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index 3215918ad73..933f7590e33 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/larmor/inputs_test_2d_larmor # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index e191b94789e..ad373471212 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/laser_injection/inputs_test_1d_laser_injection # inputs Examples/Tests/laser_injection/analysis_1d.py # analysis diags/diag1000240 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/laser_injection/inputs_test_2d_laser_injection # inputs Examples/Tests/laser_injection/analysis_2d.py # analysis diags/diag1000240 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Tests/laser_injection/inputs_test_3d_laser_injection # inputs Examples/Tests/laser_injection/analysis_3d.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index a3ab4392ea2..f5afab51712 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -10,7 +10,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -22,7 +22,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -34,7 +34,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs # Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -46,7 +46,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -58,7 +58,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -70,7 +70,7 @@ # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) # FIXME @@ -82,5 +82,5 @@ # Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs # Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis # diags/diag1000250 # output -# OFF # depend on this test +# OFF # dependency #) diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index 170d31d1956..2b63783c7c8 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 002ac281aa1..3cd434dcdda 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py # inputs Examples/Tests/load_external_field/analysis_3d.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - test_rz_load_external_field_grid # depend on this test + test_rz_load_external_field_grid # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles # inputs Examples/Tests/load_external_field/analysis_rz.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,5 +64,5 @@ add_warpx_test( Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - test_rz_load_external_field_particles # depend on this test + test_rz_load_external_field_particles # dependency ) diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index 7e4cfdd37f3..d69e0db4ca8 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,7 +23,7 @@ if(WarpX_EB) Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -36,6 +36,6 @@ if(WarpX_EB) Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py # inputs Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index 64d82fa68a1..c22da5a141e 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_FFT) Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver # inputs Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index af18068371d..a368bfea489 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr # inputs Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis diags/diag1000600 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 8feacd9b759..2c4f80a68ba 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,7 +23,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -36,7 +36,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -49,7 +49,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000160 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -62,7 +62,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -75,7 +75,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -88,7 +88,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -101,7 +101,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -114,7 +114,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid # inputs Examples/analysis_default_regression.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -127,7 +127,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -140,7 +140,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -153,7 +153,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -166,7 +166,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -179,7 +179,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -192,7 +192,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb # inputs Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis diags/diag1000400 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -205,7 +205,7 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -218,6 +218,6 @@ if(WarpX_FFT) Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ # inputs Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 45bdb5c9f8f..071401ffc3c 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver # inputs Examples/Tests/nodal_electrostatic/analysis.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 43b62ca491a..064ce07020c 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion # inputs Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,5 +64,5 @@ add_warpx_test( Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion # inputs Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index 2ad3b1ca519..85b2fad315b 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( "Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs Examples/Tests/ohm_solver_em_modes/analysis.py # analysis diags/field_diag000250 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( "Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index e919b4f27f2..f6a24affc7a 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_FFT) Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver # inputs Examples/Tests/open_bc_poisson_solver/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index b8fddeca95c..decb50ea809 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_EB) Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py # inputs Examples/Tests/particle_boundary_interaction/analysis.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index a28bbf81d6c..48eacb3901c 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption # inputs Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis diags/diag1000060 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -22,5 +22,5 @@ add_warpx_test( Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py # inputs Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 5bd5b0dce01..4884f9540bc 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,6 +23,6 @@ if(WarpX_EB) Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py # inputs Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis diags/diag1000060 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index e20b8efc898..9df17f5f568 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs Examples/Tests/particle_data_python/analysis.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) # FIXME @@ -32,5 +32,5 @@ add_warpx_test( # Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs # Examples/Tests/particle_data_python/analysis.py # analysis # diags/diag1000010 # output -# OFF # depend on this test +# OFF # dependency #) diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index d69be3b2c9b..41650ef4e73 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) # FIXME @@ -21,5 +21,5 @@ add_warpx_test( # Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags_single_precision # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output -# OFF # depend on this test +# OFF # dependency #) diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index db82a5d2184..81f20740535 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher # inputs Examples/Tests/particle_pusher/analysis.py # analysis diags/diag1010000 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index 846c3c7e6fa..c1f8eff36f9 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary # inputs Examples/Tests/particle_thermal_boundary/analysis.py # analysis diags/diag1002000 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index 5d145300b3d..315c4d40a7e 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000180 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000120 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,5 +42,5 @@ add_warpx_test( Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr # inputs Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index 2e4714738f1..33306b8a304 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -10,5 +10,5 @@ # Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs # Examples/Tests/pass_mpi_communicator/analysis.py # analysis # diags/diag1000010 # output -# OFF # depend on this test +# OFF # dependency #) diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index 8ee719c581d..bd12aae55a1 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/pec/inputs_test_3d_pec_field # inputs Examples/Tests/pec/analysis_pec.py # analysis diags/diag1000125 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/pec/inputs_test_3d_pec_field_mr # inputs Examples/Tests/pec/analysis_pec_mr.py # analysis diags/diag1000125 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Tests/pec/inputs_test_3d_pec_particle # inputs Examples/analysis_default_regression.py # analysis diags/diag1000020 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index bc126fe4908..e55ad5bdece 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher # inputs Examples/Tests/photon_pusher/analysis.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index 101028e27af..a51b3567c62 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,5 +53,5 @@ add_warpx_test( Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short # inputs Examples/Tests/plasma_lens/analysis.py # analysis diags/diag1000084 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 6f013971436..66e513136a8 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_FFT) Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,7 +23,7 @@ if(WarpX_FFT) Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -35,7 +35,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_ckc # inputs Examples/Tests/pml/analysis_pml_ckc.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -46,7 +46,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_galilean # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -57,7 +57,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_psatd # inputs Examples/Tests/pml/analysis_pml_psatd.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -68,7 +68,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - test_2d_pml_x_psatd # depend on this test + test_2d_pml_x_psatd # dependency ) add_warpx_test( @@ -79,7 +79,7 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_yee # inputs Examples/Tests/pml/analysis_pml_yee.py # analysis diags/diag1000300 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -90,5 +90,5 @@ add_warpx_test( Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000300 # output - test_2d_pml_x_yee # depend on this test + test_2d_pml_x_yee # dependency ) diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index f38f6dab9c9..aa28408f563 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,6 +23,6 @@ if(WarpX_EB) Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb # inputs Examples/Tests/point_of_contact_eb/analysis.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index 79e79062c43..1cde644ee1b 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -10,6 +10,6 @@ if(WarpX_FFT) Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000100 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index d8ddb523cbe..dd2b8009eff 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler # inputs Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd # inputs Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -53,7 +53,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_2d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -64,7 +64,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_quantum_sync # inputs Examples/Tests/qed/analysis_quantum_sync.py # analysis diags/diag1000002 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -75,7 +75,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -86,7 +86,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -97,7 +97,7 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -108,5 +108,5 @@ add_warpx_test( Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 # inputs Examples/Tests/qed/analysis_schwinger.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index fdd47bb7e11..d26f5c4d6ce 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction # inputs Examples/Tests/radiation_reaction/analysis.py # analysis diags/diag1000064 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index edaa276c91c..4214c0f5914 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags # inputs Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,7 +42,7 @@ add_warpx_test( Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output - OFF # depend on this test + OFF # dependency ) if(WarpX_FFT) @@ -54,6 +54,6 @@ if(WarpX_FFT) Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index 6c269a797f3..0bcd59920ae 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization # inputs Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index f831c9e1164..494cee234cd 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles # inputs Examples/Tests/repelling_particles/analysis.py # analysis diags/diag1000200 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index b94c99ae816..01a56accd4c 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/resampling/inputs_test_2d_leveling_thinning # inputs Examples/Tests/resampling/analysis.py # analysis diags/diag1000008 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,5 +31,5 @@ add_warpx_test( Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs Examples/analysis_default_regression.py # analysis diags/diag1000004 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index af2874848bf..5f990f0663f 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) # FIXME @@ -21,7 +21,7 @@ add_warpx_test( # Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs # Examples/analysis_default_regression.py # analysis # diags/diag1000010 # output -# OFF # depend on this test +# OFF # dependency #) add_warpx_test( @@ -32,7 +32,7 @@ add_warpx_test( Examples/Tests/restart/inputs_test_3d_acceleration # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -43,7 +43,7 @@ add_warpx_test( Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - test_3d_acceleration # depend on this test + test_3d_acceleration # dependency ) if(WarpX_FFT) @@ -55,7 +55,7 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -68,7 +68,7 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - test_3d_acceleration_psatd # depend on this test + test_3d_acceleration_psatd # dependency ) endif() @@ -81,7 +81,7 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -94,6 +94,6 @@ if(WarpX_FFT) Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - test_3d_acceleration_psatd_time_avg # depend on this test + test_3d_acceleration_psatd_time_avg # dependency ) endif() diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index c5155c5ff09..9e901d67397 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab # inputs Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis diags/diag1000289 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index 0857c0827ab..30513572b0d 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_EB) Examples/Tests/scraping/inputs_test_rz_scraping # inputs Examples/Tests/scraping/analysis_rz.py # analysis diags/diag1000037 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,6 +23,6 @@ if(WarpX_EB) Examples/Tests/scraping/inputs_test_rz_scraping_filter # inputs Examples/Tests/scraping/analysis_rz_filter.py # analysis diags/diag1000037 # output - OFF # depend on this test + OFF # dependency ) endif() diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index 1475bc705f8..9894dbf01d5 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,7 +20,7 @@ add_warpx_test( Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -31,7 +31,7 @@ add_warpx_test( Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -42,5 +42,5 @@ add_warpx_test( Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z # inputs Examples/Tests/silver_mueller/analysis.py # analysis diags/diag1000500 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index e83f300387f..95aac7c42ee 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/single_particle/inputs_test_2d_bilinear_filter # inputs Examples/Tests/single_particle/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index 5238ae7e12b..30115fdc33e 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -9,7 +9,7 @@ add_warpx_test( Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) add_warpx_test( @@ -20,5 +20,5 @@ add_warpx_test( Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization # inputs Examples/Tests/space_charge_initialization/analysis.py # analysis diags/diag1000001 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index 9494a343bb1..3eb6b189ac6 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -9,5 +9,5 @@ add_warpx_test( Examples/Tests/subcycling/inputs_test_2d_subcycling_mr # inputs Examples/analysis_default_regression.py # analysis diags/diag1000250 # output - OFF # depend on this test + OFF # dependency ) diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index 753dde9eeae..b39ea38953d 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -10,7 +10,7 @@ if(WarpX_FFT) Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000050 # output - OFF # depend on this test + OFF # dependency ) endif() @@ -23,6 +23,6 @@ if(WarpX_FFT) Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition # inputs Examples/Tests/vay_deposition/analysis.py # analysis diags/diag1000025 # output - OFF # depend on this test + OFF # dependency ) endif() From 68c25eb0f0e10e3aa700e0a1b6c52750f0c658dd Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 18:28:00 -0700 Subject: [PATCH 126/167] Fix restart tests --- Examples/Physics_applications/uniform_plasma/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index d9fbf237fca..65eb0060d78 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -31,5 +31,5 @@ add_warpx_test( Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs Examples/analysis_default_regression.py # analysis diags/diag1000010 # output - OFF # dependency + test_3d_uniform_plasma # dependency ) From 296215b337adfaefa09bb250a5c7c16bc59c9451 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 18:28:37 -0700 Subject: [PATCH 127/167] Fix Python tests --- Examples/CMakeLists.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index fac3ff20760..3677ceba255 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -58,17 +58,6 @@ function(add_warpx_test return() endif() - # Python test? - set(python OFF) - if(inputs MATCHES ".*\.py$") - set(python ON) - endif() - - # cannot run Python tests w/o Python support - if(python AND NOT WarpX_PYTHON) - return() - endif() - # set dimension suffix warpx_set_suffix_dims(SD ${dims}) @@ -102,6 +91,17 @@ function(add_warpx_test string(REPLACE "_restart" "" INPUTS_FILE_NORESTART ${INPUTS_FILE}) file(COPY ${INPUTS_FILE_NORESTART} DESTINATION ${THIS_WORKING_DIR}) + # Python test? + set(python OFF) + if(${INPUTS_FILE} MATCHES ".*\.py$") + set(python ON) + endif() + + # cannot run Python tests w/o Python support + if(python AND NOT WarpX_PYTHON) + return() + endif() + # set MPI executable set(THIS_MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} @@ -119,6 +119,8 @@ function(add_warpx_test # test run if(python) + # for argparse, do not pass command-line arguments as one quoted string + separate_arguments(INPUTS_ARGS UNIX_COMMAND "${INPUTS_ARGS}") add_test( NAME ${name}.run COMMAND From 429982db95e3d2f969062bc2fc7e9576adfae3df Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 23:19:48 -0700 Subject: [PATCH 128/167] Fix GitHub Action's YAML files --- .github/workflows/insitu.yml | 20 ++++++++++---------- .github/workflows/ubuntu.yml | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/insitu.yml b/.github/workflows/insitu.yml index 32c321c7df8..e4f9e4dd152 100644 --- a/.github/workflows/insitu.yml +++ b/.github/workflows/insitu.yml @@ -59,7 +59,7 @@ jobs: cp Examples/Physics_applications/laser_acceleration/inputs_base_3d . cp Examples/Physics_applications/laser_acceleration/3d_ascent_actions.yaml ascent_actions.yaml mpiexec -n 2 ./build/bin/warpx.3d \ - inputs_base_3d \ + inputs_base_3d \ max_step = 40 \ diag1.intervals = 30:40:10 \ diag1.format = ascent @@ -97,10 +97,10 @@ jobs: cmake --build build -j 10 - name: 2D Test run: | - cp Examples/Tests/ionization/inputs_2d_rt . + cp Examples/Tests/ionization/inputs_test_2d_ionization_lab . cp Examples/Tests/ionization/catalyst_pipeline.py . mpiexec -n 2 ./build/bin/warpx.2d \ - inputs_2d_rt \ + inputs_test_2d_ionization_lab \ catalyst.script_paths = catalyst_pipeline.py\ catalyst.implementation = paraview\ diag1.intervals = 16\ @@ -108,15 +108,15 @@ jobs: diag1.format = catalyst - name: 3D Test run: | - cp Examples/Tests/electrostatic_sphere/inputs_3d . + cp Examples/Tests/electrostatic_sphere/inputs_base_3d . cp Examples/Tests/electrostatic_sphere/catalyst_pipeline.py . mpiexec -n 2 ./build/bin/warpx.3d \ - inputs_3d \ - catalyst.script_paths = catalyst_pipeline.py \ - catalyst.implementation = paraview \ - diagnostics.diags_names = diag1 \ - diag1.format = catalyst\ - diag1.intervals = 3 + inputs_base_3d \ + catalyst.script_paths = catalyst_pipeline.py \ + catalyst.implementation = paraview \ + diagnostics.diags_names = diag1 \ + diag1.format = catalyst\ + diag1.intervals = 3 - uses: actions/upload-artifact@v4 with: name: catalyst-test-artifacts diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 881e641e5fd..d9a1a4745ce 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -210,7 +210,6 @@ jobs: cmake -S . -B build \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - #-DWarpX_APP=OFF \ -DWarpX_FFT=ON \ -DWarpX_PYTHON=ON \ -DWarpX_QED_TABLE_GEN=ON From 57bc134d365ee118dc2298530e7fa85c57a567b8 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 26 Aug 2024 23:37:56 -0700 Subject: [PATCH 129/167] Fix broken tests --- .../capacitive_discharge/CMakeLists.txt | 2 +- .../analysis_electrostatic_sphere.py | 4 ++-- Examples/Tests/plasma_lens/analysis.py | 9 ++++----- .../analysis_reduced_diags_load_balance_costs.py | 7 ++++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index 752058f55c7..f4008e97526 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -51,7 +51,7 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test -dsmc" # inputs + "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --dsmc" # inputs Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis diags/diag1000050 # output OFF # dependency diff --git a/Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py b/Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py index 4acd868a148..33842058b0b 100755 --- a/Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py +++ b/Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py @@ -34,12 +34,13 @@ yt.funcs.mylog.setLevel(0) # Open plotfile specified in command line +test_name = os.path.split(os.getcwd())[1] filename = sys.argv[1] ds = yt.load(filename) t_max = ds.current_time.item() # time of simulation # Parse test name and check if particle_shape = 4 is used -emass_10 = True if re.search("emass_10", filename) else False +emass_10 = True if re.search("emass_10", test_name) else False if emass_10: l2_tolerance = 0.096 @@ -193,5 +194,4 @@ def return_energies(iteration): ) # Check conservation of energy # Checksum regression analysis -test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/plasma_lens/analysis.py b/Examples/Tests/plasma_lens/analysis.py index 3d1597dbfcf..11e2a084ac5 100755 --- a/Examples/Tests/plasma_lens/analysis.py +++ b/Examples/Tests/plasma_lens/analysis.py @@ -16,6 +16,7 @@ """ import os +import re import sys import numpy as np @@ -194,10 +195,8 @@ def applylens(x0, vx0, vz0, gamma, lens_length, lens_strength): "error in y particle velocity" ) +# The PICMI and native input versions run the same test, so +# their results are compared to the same benchmark file test_name = os.path.split(os.getcwd())[1] -# The PICMI and native input versions of `inputs_3d` run the same test, so -# their results are compared to the same benchmark file. -if test_name == "plasma_lens_picmi": - test_name = "plasma_lens" - +test_name = re.sub("_picmi", "", test_name) checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py b/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py index 631805810c9..05f696e2fe6 100755 --- a/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py +++ b/Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py @@ -17,6 +17,8 @@ # Possible running time: ~ 1 s +import os +import re import sys import numpy as np @@ -75,5 +77,8 @@ def get_efficiency(i): # than non-load balanced case assert efficiency_before < efficiency_after -test_name = "reduced_diags_load_balance_costs_timers" +# The PICMI and native input versions run the same test, so +# their results are compared to the same benchmark file +test_name = os.path.split(os.getcwd())[1] +test_name = re.sub("_picmi", "", test_name) checksumAPI.evaluate_checksum(test_name, fn) From e31269f2088be67b49135db3f2bcb21956727074 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 10:50:29 -0700 Subject: [PATCH 130/167] Add more tests --- Examples/Tests/CMakeLists.txt | 1 + Examples/Tests/embedded_circle/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index be189b89e30..4144e91b711 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -16,6 +16,7 @@ add_subdirectory(embedded_boundary_cube) add_subdirectory(embedded_boundary_diffraction) add_subdirectory(embedded_boundary_python_api) add_subdirectory(embedded_boundary_rotated_cube) +add_subdirectory(embedded_circle) add_subdirectory(energy_conserving_thermal_plasma) add_subdirectory(field_probe) add_subdirectory(flux_injection) diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index 23f4daaacdd..8d36f8ca249 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -7,9 +7,9 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb - OFF # preparation script Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle # inputs Examples/Tests/embedded_circle/analysis.py # analysis diags/diag1000011 + OFF # dependency ) endif() From e1f8aa0955bf4fc529da35ecad2320a92a8ed9cf Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 11:07:17 -0700 Subject: [PATCH 131/167] Fix Python script for inputs check --- .github/workflows/source/check_inputs.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/source/check_inputs.py b/.github/workflows/source/check_inputs.py index 11e4cce34ea..6683da05a81 100755 --- a/.github/workflows/source/check_inputs.py +++ b/.github/workflows/source/check_inputs.py @@ -8,8 +8,7 @@ testname_prefix = ["test_1d_", "test_2d_", "test_3d_", "test_rz_"] # collect all test names and test input filenames from CMakeLists.txt files -testnames = [] -testinputs = [] +tests = [] # walk through all files under Examples/, including subdirectories for dirpath, dirnames, filenames in os.walk(top="./Examples"): # loop over CMakeLists.txt files @@ -25,9 +24,10 @@ if re.match("add_warpx_test", line): # strip leading whitespaces, remove end-of-line comments testname = next(f).lstrip().split(" ")[0] - testnames.append(testname) # skip lines related to other function arguments - for _ in range(4): + # NOTE: update range call to reflect changes + # in the interface of 'add_warpx_test' + for _ in range(3): next(f) # strip leading whitespaces, remove end-of-line comments testinput = next(f).lstrip().split(" ")[0] @@ -38,22 +38,30 @@ testinput = re.sub('"', "", testinput) # extract filename from path testinput = os.path.split(testinput)[1] - testinputs.append(testinput) + tests.append( + {"name": testname, "input": testinput, "path": filepath} + ) # check consistency of test names and test input filenames print("\nCheck that test names and input names are correct...") wrong_testname = False wrong_testinput = False -for testname, testinput in zip(testnames, testinputs): +for test in tests: + testname = test["name"].rstrip() + testinput = test["input"].rstrip() + testpath = test["path"].rstrip() if not testname.startswith(tuple(testname_prefix)): print(f"Wrong test name: {testname}") + print(f"(from {testpath})") wrong_testname = True if "restart" in testname: if not testname.endswith("_restart") and not testname.endswith("_restart.py"): print(f"Wrong test name: {testname}") + print(f"(from {testpath})") wrong_testname = True if not testinput == f"inputs_{testname}" and not testinput.endswith("_picmi.py"): print(f"Wrong input name: {testinput}") + print(f"(from {testpath})") wrong_testinput = True if wrong_testname: @@ -73,7 +81,7 @@ for name in [ filename for filename in filenames if filename.startswith("inputs_test_") ]: - if name not in testinputs: + if name not in [test["input"] for test in tests]: print(f"Input not tested: {os.path.join(dirpath, name)}") missing_input = True From b345064b2733b7815011fd607044ef0895fa04da Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 13:01:35 -0700 Subject: [PATCH 132/167] Add more tests --- Examples/Tests/CMakeLists.txt | 3 +++ .../ohm_solver_ion_Landau_damping/CMakeLists.txt | 13 +++++++++++++ ...puts_test_2d_ohm_solver_landau_damping_picmi.py} | 4 ---- .../ohm_solver_ion_beam_instability/CMakeLists.txt | 13 +++++++++++++ ... => inputs_test_1d_ohm_solver_ion_beam_picmi.py} | 4 ---- .../ohm_solver_magnetic_reconnection/CMakeLists.txt | 13 +++++++++++++ ...st_2d_ohm_solver_magnetic_reconnection_picmi.py} | 4 ---- ....json => test_1d_ohm_solver_ion_beam_picmi.json} | 0 ...=> test_2d_ohm_solver_landau_damping_picmi.json} | 0 ..._2d_ohm_solver_magnetic_reconnection_picmi.json} | 0 10 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt rename Examples/Tests/ohm_solver_ion_Landau_damping/{inputs_test_2d_ohm_law_solver_landau_damping_picmi.py => inputs_test_2d_ohm_solver_landau_damping_picmi.py} (98%) create mode 100644 Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt rename Examples/Tests/ohm_solver_ion_beam_instability/{inputs_test_1d_ohm_law_solver_ion_beam_picmi.py => inputs_test_1d_ohm_solver_ion_beam_picmi.py} (98%) create mode 100644 Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt rename Examples/Tests/ohm_solver_magnetic_reconnection/{inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py => inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py} (98%) rename Regression/Checksum/benchmarks_json/{test_1d_ohm_law_solver_ion_beam_picmi.json => test_1d_ohm_solver_ion_beam_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{test_2d_ohm_law_solver_landau_damping_picmi.json => test_2d_ohm_solver_landau_damping_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{test_2d_ohm_law_solver_magnetic_reconnection_picmi.json => test_2d_ohm_solver_magnetic_reconnection_picmi.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 4144e91b711..2a350310e75 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -39,6 +39,9 @@ add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) add_subdirectory(nodal_electrostatic) add_subdirectory(ohm_solver_em_modes) +add_subdirectory(ohm_solver_ion_beam_instability) +add_subdirectory(ohm_solver_ion_Landau_damping) +add_subdirectory(ohm_solver_magnetic_reconnection) add_subdirectory(open_bc_poisson_solver) add_subdirectory(particle_boundary_interaction) add_subdirectory(particle_boundary_process) diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt new file mode 100644 index 00000000000..1d472caea0c --- /dev/null +++ b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_2d_ohm_solver_landau_damping_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_solver_landau_damping_picmi.py --test --dim 2 --temp_ratio 0.1" # inputs + Examples/Tests/ohm_solver_ion_Landau_damping/analysis.py # analysis + diags/diag1000100 # output + OFF # dependency +) diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_law_solver_landau_damping_picmi.py b/Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_solver_landau_damping_picmi.py similarity index 98% rename from Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_law_solver_landau_damping_picmi.py rename to Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_solver_landau_damping_picmi.py index 4f7c26bb403..7c1709d059f 100644 --- a/Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_law_solver_landau_damping_picmi.py +++ b/Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_solver_landau_damping_picmi.py @@ -219,19 +219,15 @@ def setup_run(self): particle_diag = picmi.ParticleDiagnostic( name="diag1", period=100, - write_dir=".", species=[self.ions], data_list=["ux", "uy", "uz", "x", "z", "weighting"], - warpx_file_prefix=f"Python_ohms_law_solver_landau_damping_{self.dim}d_plt", ) simulation.add_diagnostic(particle_diag) field_diag = picmi.FieldDiagnostic( name="diag1", grid=self.grid, period=100, - write_dir=".", data_list=["Bx", "By", "Bz", "Ex", "Ey", "Ez", "Jx", "Jy", "Jz"], - warpx_file_prefix=f"Python_ohms_law_solver_landau_damping_{self.dim}d_plt", ) simulation.add_diagnostic(field_diag) diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt new file mode 100644 index 00000000000..113311fc944 --- /dev/null +++ b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_1d_ohm_solver_ion_beam_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + "Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_solver_ion_beam_picmi.py --test --dim 1 --resonant" # inputs + Examples/Tests/ohm_solver_ion_beam_instability/analysis.py # analysis + diags/diag1002500 # output + OFF # dependency +) diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_law_solver_ion_beam_picmi.py b/Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_solver_ion_beam_picmi.py similarity index 98% rename from Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_law_solver_ion_beam_picmi.py rename to Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_solver_ion_beam_picmi.py index 2558d70b4b8..19569a04e5b 100644 --- a/Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_law_solver_ion_beam_picmi.py +++ b/Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_solver_ion_beam_picmi.py @@ -259,8 +259,6 @@ def setup_run(self): period=1250, species=[self.ions, self.beam_ions], data_list=["ux", "uy", "uz", "z", "weighting"], - write_dir=".", - warpx_file_prefix="Python_ohms_law_solver_ion_beam_1d_plt", ) simulation.add_diagnostic(part_diag) field_diag = picmi.FieldDiagnostic( @@ -268,8 +266,6 @@ def setup_run(self): grid=self.grid, period=1250, data_list=["Bx", "By", "Bz", "Ex", "Ey", "Ez", "Jx", "Jy", "Jz"], - write_dir=".", - warpx_file_prefix="Python_ohms_law_solver_ion_beam_1d_plt", ) simulation.add_diagnostic(field_diag) diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt new file mode 100644 index 00000000000..12454407914 --- /dev/null +++ b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_2d_ohm_solver_magnetic_reconnection_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py --test" # inputs + Examples/Tests/ohm_solver_magnetic_reconnection/analysis.py # analysis + diags/diag1000020 # output + OFF # dependency +) diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py b/Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py similarity index 98% rename from Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py rename to Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py index b776c48f5ab..4f13c76e208 100644 --- a/Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_law_solver_magnetic_reconnection_picmi.py +++ b/Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py @@ -247,10 +247,8 @@ def setup_run(self): particle_diag = picmi.ParticleDiagnostic( name="diag1", period=self.total_steps, - write_dir=".", species=[self.ions], data_list=["ux", "uy", "uz", "x", "z", "weighting"], - warpx_file_prefix="Python_ohms_law_solver_magnetic_reconnection_2d_plt", # warpx_format='openpmd', # warpx_openpmd_backend='h5', ) @@ -260,8 +258,6 @@ def setup_run(self): grid=self.grid, period=self.total_steps, data_list=["Bx", "By", "Bz", "Ex", "Ey", "Ez"], - write_dir=".", - warpx_file_prefix="Python_ohms_law_solver_magnetic_reconnection_2d_plt", # warpx_format='openpmd', # warpx_openpmd_backend='h5', ) diff --git a/Regression/Checksum/benchmarks_json/test_1d_ohm_law_solver_ion_beam_picmi.json b/Regression/Checksum/benchmarks_json/test_1d_ohm_solver_ion_beam_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_1d_ohm_law_solver_ion_beam_picmi.json rename to Regression/Checksum/benchmarks_json/test_1d_ohm_solver_ion_beam_picmi.json diff --git a/Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_landau_damping_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_ohm_solver_landau_damping_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_landau_damping_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_ohm_solver_landau_damping_picmi.json diff --git a/Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_magnetic_reconnection_picmi.json b/Regression/Checksum/benchmarks_json/test_2d_ohm_solver_magnetic_reconnection_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_2d_ohm_law_solver_magnetic_reconnection_picmi.json rename to Regression/Checksum/benchmarks_json/test_2d_ohm_solver_magnetic_reconnection_picmi.json From 3c4942bc9702ba36dac503affdb34244953cca0f Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 14:09:36 -0700 Subject: [PATCH 133/167] Add LASY laser tests --- .../laser_injection_from_file/CMakeLists.txt | 128 +++++++---- .../laser_injection_from_file/analysis_1d.py | 155 +++++-------- .../analysis_1d_boost.py | 161 +++++--------- .../laser_injection_from_file/analysis_2d.py | 195 +++++++---------- .../laser_injection_from_file/analysis_3d.py | 207 +++++++----------- ...uts_test_1d_laser_injection_from_lasy_file | 2 +- ...st_1d_laser_injection_from_lasy_file_boost | 2 +- ..._injection_from_lasy_file_boost_prepare.py | 38 ++++ ..._laser_injection_from_lasy_file_prepare.py | 37 ++++ ...uts_test_2d_laser_injection_from_lasy_file | 2 +- ..._laser_injection_from_lasy_file_prepare.py | 38 ++++ ...uts_test_3d_laser_injection_from_lasy_file | 2 +- ..._laser_injection_from_lasy_file_prepare.py | 41 ++++ 13 files changed, 524 insertions(+), 484 deletions(-) create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index f5afab51712..492ab117f50 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -13,53 +13,93 @@ # OFF # dependency #) -# FIXME -#add_warpx_test( -# test_1d_laser_injection_from_lasy_file # name -# 1 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_1d_laser_injection_from_lasy_file_prepare # name + 1 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) -# FIXME -#add_warpx_test( -# test_1d_laser_injection_from_lasy_file_boost # name -# 1 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs -# Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_1d_laser_injection_from_lasy_file # name + 1 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis + diags/diag1000251 # output + test_1d_laser_injection_from_lasy_file_prepare # dependency +) -# FIXME -#add_warpx_test( -# test_2d_laser_injection_from_lasy_file # name -# 2 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_1d_laser_injection_from_lasy_file_boost_prepare # name + 1 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) -# FIXME -#add_warpx_test( -# test_3d_laser_injection_from_lasy_file # name -# 3 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_1d_laser_injection_from_lasy_file_boost # name + 1 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs + Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis + diags/diag1000001 # output + test_1d_laser_injection_from_lasy_file_boost_prepare # dependency +) + +add_warpx_test( + test_2d_laser_injection_from_lasy_file_prepare # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) + +add_warpx_test( + test_2d_laser_injection_from_lasy_file # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis + diags/diag1000251 # output + test_2d_laser_injection_from_lasy_file_prepare # dependency +) + +add_warpx_test( + test_3d_laser_injection_from_lasy_file_prepare # name + 3 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) + +add_warpx_test( + test_3d_laser_injection_from_lasy_file # name + 3 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis + diags/diag1000251 # output + test_3d_laser_injection_from_lasy_file_prepare # dependency +) # FIXME #add_warpx_test( diff --git a/Examples/Tests/laser_injection_from_file/analysis_1d.py b/Examples/Tests/laser_injection_from_file/analysis_1d.py index e9bab5e8783..1b5f209cb91 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_1d.py +++ b/Examples/Tests/laser_injection_from_file/analysis_1d.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external lasy file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in 1D, for both envelope and central frequency -import glob import os import sys @@ -61,94 +57,61 @@ def gauss_env(T, Z): return E_max * np.real(np.exp(exp_arg)) -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - dt = ds.current_time.to_value() / steps - - z = np.linspace( - ds.domain_left_edge[0].v, ds.domain_right_edge[0].v, ds.domain_dimensions[0] - ) - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), z) + gauss_env( - -t_c + ds.current_time.to_value(), z - ) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() - env = abs(hilbert(F_laser)) - - # Plot results - plt.figure(figsize=(8, 8)) - plt.subplot(221) - plt.title("PIC field") - plt.plot(z, F_laser) - plt.subplot(222) - plt.title("PIC envelope") - plt.plot(z, env) - plt.subplot(223) - plt.title("Theory envelope") - plt.plot(z, env_theory) - plt.subplot(224) - plt.title("Difference") - plt.plot(z, env - env_theory) - - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_z = np.fft.fftfreq(F_laser.shape[0], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.abs(freq_z[pos_max[0]]) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - os.system( - "./" + executable + " inputs.1d_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000251/", "comp_unf.pdf", 251) - - -def main(): - from lasy.laser import Laser - from lasy.profiles import GaussianProfile - - # Create a laser using lasy - pol = (1, 0) - profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) - dim = "xyt" - lo = (-25e-6, -25e-6, -20e-15) - hi = (+25e-6, +25e-6, +20e-15) - npoints = (100, 100, 100) - laser = Laser(dim, lo, hi, npoints, profile) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("gaussianlaser3d") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000251/" - test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 251 +ds = yt.load(filename) +dt = ds.current_time.to_value() / steps + +z = np.linspace( + ds.domain_left_edge[0].v, ds.domain_right_edge[0].v, ds.domain_dimensions[0] +) + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), z) + gauss_env( + -t_c + ds.current_time.to_value(), z +) + +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() +env = abs(hilbert(F_laser)) + +# Plot results +plt.figure(figsize=(8, 8)) +plt.subplot(221) +plt.title("PIC field") +plt.plot(z, F_laser) +plt.subplot(222) +plt.title("PIC envelope") +plt.plot(z, env) +plt.subplot(223) +plt.title("Theory envelope") +plt.plot(z, env_theory) +plt.subplot(224) +plt.title("Difference") +plt.plot(z, env - env_theory) + +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_z = np.fft.fftfreq(F_laser.shape[0], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.abs(freq_z[pos_max[0]]) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/analysis_1d_boost.py b/Examples/Tests/laser_injection_from_file/analysis_1d_boost.py index 279b29f14ce..89c0ea3c57c 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_1d_boost.py +++ b/Examples/Tests/laser_injection_from_file/analysis_1d_boost.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external lasy file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in 1D, for both envelope and central frequency -import glob import os import sys @@ -61,99 +57,62 @@ def gauss_env(T, Z): return E_max * np.real(np.exp(exp_arg)) -def do_analysis(fname, compname): - ds = yt.load(fname) - dz = (ds.domain_right_edge[0].v - ds.domain_left_edge[0].v) / ds.domain_dimensions[ - 0 - ] - dt = dz / c - - z = np.linspace( - ds.domain_left_edge[0].v, ds.domain_right_edge[0].v, ds.domain_dimensions[0] - ) - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), z) + gauss_env( - -t_c + ds.current_time.to_value(), z - ) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() - env = abs(hilbert(F_laser)) - - # Plot results - plt.figure(figsize=(8, 8)) - plt.subplot(221) - plt.title("PIC field") - plt.plot(z, F_laser) - plt.subplot(222) - plt.title("PIC envelope") - plt.plot(z, env) - plt.subplot(223) - plt.title("Theory envelope") - plt.plot(z, env_theory) - plt.subplot(224) - plt.title("Difference") - plt.plot(z, env - env_theory) - - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_z = np.fft.fftfreq(F_laser.shape[0], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.abs(freq_z[pos_max[0]]) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - os.system( - "./" - + executable - + " inputs.1d_boost_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000001/", "comp_unf.pdf") - - -def main(): - from lasy.laser import Laser - from lasy.profiles import GaussianProfile - - # Create a laser using lasy - pol = (1, 0) - profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) - dim = "xyt" - lo = (-25e-6, -25e-6, -20e-15) - hi = (+25e-6, +25e-6, +20e-15) - npoints = (100, 100, 100) - laser = Laser(dim, lo, hi, npoints, profile) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("gaussianlaser3d") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000001/" - test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +filename = sys.argv[1] +compname = "comp_unf.pdf" +ds = yt.load(filename) +dz = (ds.domain_right_edge[0].v - ds.domain_left_edge[0].v) / ds.domain_dimensions[0] +dt = dz / c + +z = np.linspace( + ds.domain_left_edge[0].v, ds.domain_right_edge[0].v, ds.domain_dimensions[0] +) + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), z) + gauss_env( + -t_c + ds.current_time.to_value(), z +) + +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() +env = abs(hilbert(F_laser)) + +# Plot results +plt.figure(figsize=(8, 8)) +plt.subplot(221) +plt.title("PIC field") +plt.plot(z, F_laser) +plt.subplot(222) +plt.title("PIC envelope") +plt.plot(z, env) +plt.subplot(223) +plt.title("Theory envelope") +plt.plot(z, env_theory) +plt.subplot(224) +plt.title("Difference") +plt.plot(z, env - env_theory) + +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_z = np.fft.fftfreq(F_laser.shape[0], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.abs(freq_z[pos_max[0]]) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +# Do the checksum test +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/analysis_2d.py b/Examples/Tests/laser_injection_from_file/analysis_2d.py index 18c178cea15..ab5649e968f 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_2d.py +++ b/Examples/Tests/laser_injection_from_file/analysis_2d.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external lasy file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in 2D, for both envelope and central frequency -import glob import os import sys @@ -66,115 +62,82 @@ def gauss_env(T, X, Y, Z): return E_max * np.real(np.exp(exp_arg)) -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - dt = ds.current_time.to_value() / steps - - # Define 3D meshes - x = np.linspace( - ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] - ).v - y = np.linspace( - ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] - ).v - z = np.linspace( - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_dimensions[ds.dimensionality - 1], - ).v - X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( - -t_c + ds.current_time.to_value(), X, Y, Z - ) +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 251 +ds = yt.load(filename) +dt = ds.current_time.to_value() / steps + +# Define 3D meshes +x = np.linspace( + ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] +).v +y = np.linspace( + ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] +).v +z = np.linspace( + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_dimensions[ds.dimensionality - 1], +).v +X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( + -t_c + ds.current_time.to_value(), X, Y, Z +) - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() - env = abs(hilbert(F_laser)) - extent = [ - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_left_edge[0], - ds.domain_right_edge[0], - ] - env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] - - # Plot results - plt.figure(figsize=(8, 6)) - plt.subplot(221) - plt.title("PIC field") - plt.imshow(F_laser, extent=extent) - plt.colorbar() - plt.subplot(222) - plt.title("PIC envelope") - plt.imshow(env, extent=extent) - plt.colorbar() - plt.subplot(223) - plt.title("Theory envelope") - plt.imshow(env_theory_slice, extent=extent) - plt.colorbar() - plt.subplot(224) - plt.title("Difference") - plt.imshow(env - env_theory_slice, extent=extent) - plt.colorbar() - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_x = np.fft.fftfreq(F_laser.shape[0], dt) - freq_z = np.fft.fftfreq(F_laser.shape[1], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - os.system( - "./" + executable + " inputs.2d_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000251/", "comp_unf.pdf", 251) - - -def main(): - from lasy.laser import Laser - from lasy.profiles import GaussianProfile - - # Create a laser using lasy - pol = (1, 0) - profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) - dim = "xyt" - lo = (-25e-6, -25e-6, -20e-15) - hi = (+25e-6, +25e-6, +20e-15) - npoints = (100, 100, 100) - laser = Laser(dim, lo, hi, npoints, profile) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("gaussianlaser3d") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000251/" - test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() +env = abs(hilbert(F_laser)) +extent = [ + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_left_edge[0], + ds.domain_right_edge[0], +] +env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] + +# Plot results +plt.figure(figsize=(8, 6)) +plt.subplot(221) +plt.title("PIC field") +plt.imshow(F_laser, extent=extent) +plt.colorbar() +plt.subplot(222) +plt.title("PIC envelope") +plt.imshow(env, extent=extent) +plt.colorbar() +plt.subplot(223) +plt.title("Theory envelope") +plt.imshow(env_theory_slice, extent=extent) +plt.colorbar() +plt.subplot(224) +plt.title("Difference") +plt.imshow(env - env_theory_slice, extent=extent) +plt.colorbar() +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_x = np.fft.fftfreq(F_laser.shape[0], dt) +freq_z = np.fft.fftfreq(F_laser.shape[1], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/analysis_3d.py b/Examples/Tests/laser_injection_from_file/analysis_3d.py index 59fe2c6ce8a..7d30af28639 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_3d.py +++ b/Examples/Tests/laser_injection_from_file/analysis_3d.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external lasy file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in 3D, for both envelope and central frequency -import glob import os import sys @@ -66,123 +62,88 @@ def gauss_env(T, X, Y, Z): return E_max * np.real(np.exp(exp_arg)) -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - dt = ds.current_time.to_value() / steps - - # Define 3D meshes - x = np.linspace( - ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] - ).v - y = np.linspace( - ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] - ).v - z = np.linspace( - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_dimensions[ds.dimensionality - 1], - ).v - X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( - -t_c + ds.current_time.to_value(), X, Y, Z - ) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() - env = abs(hilbert(F_laser)) - extent = [ - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_left_edge[0], - ds.domain_right_edge[0], - ] - - F_slice = F_laser[:, F_laser.shape[1] // 2, :] - env_slice = env[:, env.shape[1] // 2, :] - env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] - - # Plot results - plt.figure(figsize=(8, 6)) - plt.subplot(221) - plt.title("PIC field") - plt.imshow(F_slice, extent=extent) - plt.colorbar() - plt.subplot(222) - plt.title("PIC envelope") - plt.imshow(env_slice, extent=extent) - plt.colorbar() - plt.subplot(223) - plt.title("Theory envelope") - plt.imshow(env_theory_slice, extent=extent) - plt.colorbar() - plt.subplot(224) - plt.title("Difference") - plt.imshow(env_slice - env_theory_slice, extent=extent) - plt.colorbar() - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_x = np.fft.fftfreq(F_laser.shape[0], dt) - freq_y = np.fft.fftfreq(F_laser.shape[1], dt) - freq_z = np.fft.fftfreq(F_laser.shape[2], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.sqrt( - (freq_x[pos_max[0]]) ** 2 - + (freq_y[pos_max[1]] ** 2) - + (freq_z[pos_max[2]]) ** 2 - ) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 251 +ds = yt.load(filename) +dt = ds.current_time.to_value() / steps + +# Define 3D meshes +x = np.linspace( + ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] +).v +y = np.linspace( + ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] +).v +z = np.linspace( + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_dimensions[ds.dimensionality - 1], +).v +X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( + -t_c + ds.current_time.to_value(), X, Y, Z +) +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() +env = abs(hilbert(F_laser)) +extent = [ + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_left_edge[0], + ds.domain_right_edge[0], +] + +F_slice = F_laser[:, F_laser.shape[1] // 2, :] +env_slice = env[:, env.shape[1] // 2, :] +env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] + +# Plot results +plt.figure(figsize=(8, 6)) +plt.subplot(221) +plt.title("PIC field") +plt.imshow(F_slice, extent=extent) +plt.colorbar() +plt.subplot(222) +plt.title("PIC envelope") +plt.imshow(env_slice, extent=extent) +plt.colorbar() +plt.subplot(223) +plt.title("Theory envelope") +plt.imshow(env_theory_slice, extent=extent) +plt.colorbar() +plt.subplot(224) +plt.title("Difference") +plt.imshow(env_slice - env_theory_slice, extent=extent) +plt.colorbar() +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_x = np.fft.fftfreq(F_laser.shape[0], dt) +freq_y = np.fft.fftfreq(F_laser.shape[1], dt) +freq_z = np.fft.fftfreq(F_laser.shape[2], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.sqrt( + (freq_x[pos_max[0]]) ** 2 + (freq_y[pos_max[1]] ** 2) + (freq_z[pos_max[2]]) ** 2 +) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold -def launch_analysis(executable): - os.system( - "./" + executable + " inputs.3d_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000251/", "comp_unf.pdf", 251) - - -def main(): - from lasy.laser import Laser - from lasy.profiles import GaussianProfile - - # Create a laser using lasy - pol = (1, 0) - profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) - dim = "xyt" - lo = (-25e-6, -25e-6, -20e-15) - hi = (+25e-6, +25e-6, +20e-15) - npoints = (100, 100, 100) - laser = Laser(dim, lo, hi, npoints, profile) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("gaussianlaser3d") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000251/" - test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file index 6c392883418..78acdba0756 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "diags/gaussianlaser3d_00000.h5" +lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost index ffc1865ee0f..f9bea5390be 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost @@ -47,7 +47,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "diags/gaussianlaser3d_00000.h5" +lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_boost_prepare/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py new file mode 100755 index 00000000000..f71b87d5fc8 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import GaussianProfile + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +# Create a laser using lasy +profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) +dim = "xyt" +lo = (-25e-6, -25e-6, -20e-15) +hi = (+25e-6, +25e-6, +20e-15) +npoints = (100, 100, 100) +laser = Laser(dim, lo, hi, npoints, profile) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("gaussian_laser_3d") diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py new file mode 100755 index 00000000000..902b0c47210 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py @@ -0,0 +1,37 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import GaussianProfile + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs + +# Create a laser using lasy +profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) +dim = "xyt" +lo = (-25e-6, -25e-6, -20e-15) +hi = (+25e-6, +25e-6, +20e-15) +npoints = (100, 100, 100) +laser = Laser(dim, lo, hi, npoints, profile) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("gaussian_laser_3d") diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file index e5814471753..45994df7d7b 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "diags/gaussianlaser3d_00000.h5" +lasy_laser.lasy_file_name = "../test_2d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py new file mode 100755 index 00000000000..f71b87d5fc8 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py @@ -0,0 +1,38 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import GaussianProfile + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +# Create a laser using lasy +profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) +dim = "xyt" +lo = (-25e-6, -25e-6, -20e-15) +hi = (+25e-6, +25e-6, +20e-15) +npoints = (100, 100, 100) +laser = Laser(dim, lo, hi, npoints, profile) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("gaussian_laser_3d") diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file index ad8159cb650..c3613fda1ea 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "diags/gaussianlaser3d_00000.h5" +lasy_laser.lasy_file_name = "../test_3d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py new file mode 100755 index 00000000000..410dcd2c36e --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import GaussianProfile + +# Maximum acceptable error for this test +relative_error_threshold = 0.065 + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +# Create a laser using lasy +profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) +dim = "xyt" +lo = (-25e-6, -25e-6, -20e-15) +hi = (+25e-6, +25e-6, +20e-15) +npoints = (100, 100, 100) +laser = Laser(dim, lo, hi, npoints, profile) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("gaussian_laser_3d") From 5a2cb9f86c78be914c2dbab4030bba32f01f0bcc Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 15:01:19 -0700 Subject: [PATCH 134/167] Fix Python script for inputs check --- .github/workflows/source/check_inputs.py | 29 +++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/source/check_inputs.py b/.github/workflows/source/check_inputs.py index 6683da05a81..5f22091ecb5 100755 --- a/.github/workflows/source/check_inputs.py +++ b/.github/workflows/source/check_inputs.py @@ -54,23 +54,36 @@ print(f"Wrong test name: {testname}") print(f"(from {testpath})") wrong_testname = True + # PICMI tests + if "picmi" in testname: + if not testname.endswith("_picmi"): + print(f"Wrong test name: {testname}") + print(f"(from {testpath})") + wrong_testname = True + # restart tests if "restart" in testname: if not testname.endswith("_restart") and not testname.endswith("_restart.py"): print(f"Wrong test name: {testname}") print(f"(from {testpath})") wrong_testname = True - if not testinput == f"inputs_{testname}" and not testinput.endswith("_picmi.py"): - print(f"Wrong input name: {testinput}") - print(f"(from {testpath})") - wrong_testinput = True + # test input file names + if ( + not testinput == f"inputs_{testname}" + and not testinput == f"inputs_{testname}.py" + ): + # we may be using a base input file/script + if not testinput.startswith("inputs_base"): + print(f"Wrong input name: {testinput}") + print(f"(from {testpath})") + wrong_testinput = True if wrong_testname: print(f"NOTE: Test names must start with one of {testname_prefix}.") - print(" Test names must end with '_restart' for restart tests") - print(" (with the extension '.py' in the case of PICMI input scripts).") + print(" Test names must end with '_restart' for restart tests.") + print(" Test names must end with '_picmi' for PICMI tests.") if wrong_testinput: - print("NOTE: Test input names must start with 'inputs_' followed by the test name") - print(" (with the extension '.py' in the case of PICMI input scripts).") + print("NOTE: Test input names must start with 'inputs_' followed by the test name.") + print(" Test input names must end with '.py' for PICMI tests.") # check that all input files in Examples/ are tested print("\nCheck that all test input files are tested...") From aae3a1b39f5425838910601cf544ab73fb3ae58f Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 15:14:54 -0700 Subject: [PATCH 135/167] Fix test names --- .../Physics_applications/spacecraft_charging/CMakeLists.txt | 2 +- ...aft_charging.json => test_rz_spacecraft_charging_picmi.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Regression/Checksum/benchmarks_json/{test_rz_spacecraft_charging.json => test_rz_spacecraft_charging_picmi.json} (100%) diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index fdc97d581e6..e4e3f9ae1d2 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -3,7 +3,7 @@ if(WarpX_EB) add_warpx_test( - test_rz_spacecraft_charging # name + test_rz_spacecraft_charging_picmi # name RZ # dims 2 # nprocs ON # eb diff --git a/Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging.json b/Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging.json rename to Regression/Checksum/benchmarks_json/test_rz_spacecraft_charging_picmi.json From 74559162ff64a8c3bc612db68b76e030ef216082 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 15:32:06 -0700 Subject: [PATCH 136/167] Add LASY laser tests --- .../laser_injection_from_file/CMakeLists.txt | 64 ++++-- .../laser_injection_from_file/analysis_RZ.py | 181 --------------- .../analysis_from_RZ_file.py | 209 +++++++----------- .../laser_injection_from_file/analysis_rz.py | 144 ++++++++++++ ..._test_rz_laser_injection_from_RZ_lasy_file | 2 +- ...ser_injection_from_RZ_lasy_file_prepare.py | 49 ++++ ...uts_test_rz_laser_injection_from_lasy_file | 2 +- ..._laser_injection_from_lasy_file_prepare.py | 41 ++++ 8 files changed, 359 insertions(+), 333 deletions(-) delete mode 100755 Examples/Tests/laser_injection_from_file/analysis_RZ.py create mode 100755 Examples/Tests/laser_injection_from_file/analysis_rz.py create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 492ab117f50..e1c6d0bd957 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -101,26 +101,46 @@ add_warpx_test( test_3d_laser_injection_from_lasy_file_prepare # dependency ) -# FIXME -#add_warpx_test( -# test_rz_laser_injection_from_lasy_file # name -# RZ # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_RZ.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_rz_laser_injection_from_lasy_file_prepare # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) -# FIXME -#add_warpx_test( -# test_rz_laser_injection_from_RZ_lasy_file # name -# RZ # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_rz_laser_injection_from_lasy_file # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_rz.py # analysis + diags/diag1000252 # output + test_rz_laser_injection_from_lasy_file_prepare # dependency +) + +add_warpx_test( + test_rz_laser_injection_from_RZ_lasy_file_prepare # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) + +add_warpx_test( + test_rz_laser_injection_from_RZ_lasy_file # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs + Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis + diags/diag1000612 # output + test_rz_laser_injection_from_RZ_lasy_file_prepare # dependency +) diff --git a/Examples/Tests/laser_injection_from_file/analysis_RZ.py b/Examples/Tests/laser_injection_from_file/analysis_RZ.py deleted file mode 100755 index 5ebba5b86e2..00000000000 --- a/Examples/Tests/laser_injection_from_file/analysis_RZ.py +++ /dev/null @@ -1,181 +0,0 @@ -#!/usr/bin/env python3 - -# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli -# Remi Lehe, Ilian Kara-Mostefa -# -# This file is part of WarpX. -# -# License: BSD-3-Clause-LBNL - - -# This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected -# - Compute the theory for laser envelope at time T -# - Compare theory and simulation in RZ, for both envelope and central frequency - -import glob -import os -import sys - -import matplotlib - -matplotlib.use("Agg") -import matplotlib.pyplot as plt -import numpy as np -import yt -from scipy.constants import c, epsilon_0 -from scipy.signal import hilbert - -yt.funcs.mylog.setLevel(50) - -sys.path.insert(1, "../../../../warpx/Regression/Checksum/") -import checksumAPI - -# Maximum acceptable error for this test -relative_error_threshold = 0.065 - -# Physical parameters -um = 1.0e-6 -fs = 1.0e-15 - -# Parameters of the gaussian beam -wavelength = 1.0 * um -w0 = 12.0 * um -tt = 10.0 * fs -t_c = 20.0 * fs - -laser_energy = 1.0 -E_max = np.sqrt( - 2 * (2 / np.pi) ** (3 / 2) * laser_energy / (epsilon_0 * w0**2 * c * tt) -) - - -# Function for the envelope -def gauss_env(T, X, Y, Z): - # Function to compute the theory for the envelope - inv_tau2 = 1.0 / tt / tt - inv_w_2 = 1.0 / (w0 * w0) - exp_arg = ( - -(X * X) * inv_w_2 - - (Y * Y) * inv_w_2 - - inv_tau2 / c / c * (Z - T * c) * (Z - T * c) - ) - return E_max * np.real(np.exp(exp_arg)) - - -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - dt = ds.current_time.to_value() / steps - - # Define 3D meshes - x = np.linspace( - ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] - ).v - y = np.linspace( - ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] - ).v - z = np.linspace( - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_dimensions[ds.dimensionality - 1], - ).v - X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( - -t_c + ds.current_time.to_value(), X, Y, Z - ) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Et"].v.squeeze() - env = abs(hilbert(F_laser)) - extent = [ - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_left_edge[0], - ds.domain_right_edge[0], - ] - - env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] - - # Plot results - plt.figure(figsize=(8, 6)) - plt.subplot(221) - plt.title("PIC field") - plt.imshow(F_laser, extent=extent) - plt.colorbar() - plt.subplot(222) - plt.title("PIC envelope") - plt.imshow(env, extent=extent) - plt.colorbar() - plt.subplot(223) - plt.title("Theory envelope") - plt.imshow(env_theory_slice, extent=extent) - plt.colorbar() - plt.subplot(224) - plt.title("Difference") - plt.imshow(env - env_theory_slice, extent=extent) - plt.colorbar() - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_x = np.fft.fftfreq(F_laser.shape[0], dt) - freq_z = np.fft.fftfreq(F_laser.shape[1], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - os.system( - "./" + executable + " inputs.RZ_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000252/", "comp_unf.pdf", 252) - - -def main(): - from lasy.laser import Laser - from lasy.profiles import GaussianProfile - - # Create a laser using lasy - pol = (1, 0) - profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) - dim = "xyt" - lo = (-25e-6, -25e-6, -20e-15) - hi = (+25e-6, +25e-6, +20e-15) - npoints = (100, 100, 100) - laser = Laser(dim, lo, hi, npoints, profile) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("gaussianlaser3d") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000252/" - test_name = os.path.split(os.getcwd())[1] - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() diff --git a/Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py b/Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py index 8bc0daea481..72575da96b4 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py +++ b/Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external lasy file. -# -# - Generate an input lasy file with a Laguerre Gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external lasy file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in RZ, for both envelope and central frequency -import glob import os import sys @@ -73,126 +69,83 @@ def laguerre_env(T, X, Y, Z, p, m): return E_max * np.real(envelope) -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - dt = ds.current_time.to_value() / steps - - # Define 3D meshes - x = np.linspace( - ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] - ).v - y = np.linspace( - ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] - ).v - z = np.linspace( - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_dimensions[ds.dimensionality - 1], - ).v - X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") - - # Compute the theory for envelope - env_theory = laguerre_env( - +t_c - ds.current_time.to_value(), X, Y, Z, p=0, m=1 - ) + laguerre_env(-t_c + ds.current_time.to_value(), X, Y, Z, p=0, m=1) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Et"].v.squeeze() - env = abs(hilbert(F_laser)) - extent = [ - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_left_edge[0], - ds.domain_right_edge[0], - ] - - env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] - - # Plot results - plt.figure(figsize=(8, 6)) - plt.subplot(221) - plt.title("PIC field") - plt.imshow(F_laser, extent=extent) - plt.colorbar() - plt.subplot(222) - plt.title("PIC envelope") - plt.imshow(env, extent=extent) - plt.colorbar() - plt.subplot(223) - plt.title("Theory envelope") - plt.imshow(env_theory_slice, extent=extent) - plt.colorbar() - plt.subplot(224) - plt.title("Difference") - plt.imshow(env - env_theory_slice, extent=extent) - plt.colorbar() - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fftn(F_laser) - - freq_x = np.fft.fftfreq(F_laser.shape[0], dt) - freq_z = np.fft.fftfreq(F_laser.shape[1], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) - exp_freq = c / wavelength - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - os.system( - "./" - + executable - + " inputs.from_RZ_file_test diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000612/", "comp_unf.pdf", 612) - - -def main(): - from lasy.laser import Laser - from lasy.profiles import CombinedLongitudinalTransverseProfile - from lasy.profiles.longitudinal import GaussianLongitudinalProfile - from lasy.profiles.transverse import LaguerreGaussianTransverseProfile - - # Create a Laguerre Gaussian laser in RZ geometry using lasy - pol = (1, 0) - profile = CombinedLongitudinalTransverseProfile( - wavelength, - pol, - laser_energy, - GaussianLongitudinalProfile(wavelength, tt, t_peak=0), - LaguerreGaussianTransverseProfile(w0, p=0, m=1), - ) - dim = "rt" - lo = (0e-6, -20e-15) - hi = (+25e-6, +20e-15) - npoints = (100, 100) - laser = Laser(dim, lo, hi, npoints, profile, n_azimuthal_modes=2) - laser.normalize(laser_energy, kind="energy") - laser.write_to_file("laguerrelaserRZ") - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000612/" - test_name = "LaserInjectionFromRZLASYFile" - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 612 +ds = yt.load(filename) +dt = ds.current_time.to_value() / steps + +# Define 3D meshes +x = np.linspace( + ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] +).v +y = np.linspace( + ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] +).v +z = np.linspace( + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_dimensions[ds.dimensionality - 1], +).v +X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") + +# Compute the theory for envelope +env_theory = laguerre_env( + +t_c - ds.current_time.to_value(), X, Y, Z, p=0, m=1 +) + laguerre_env(-t_c + ds.current_time.to_value(), X, Y, Z, p=0, m=1) + +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Et"].v.squeeze() +env = abs(hilbert(F_laser)) +extent = [ + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_left_edge[0], + ds.domain_right_edge[0], +] + +env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] + +# Plot results +plt.figure(figsize=(8, 6)) +plt.subplot(221) +plt.title("PIC field") +plt.imshow(F_laser, extent=extent) +plt.colorbar() +plt.subplot(222) +plt.title("PIC envelope") +plt.imshow(env, extent=extent) +plt.colorbar() +plt.subplot(223) +plt.title("Theory envelope") +plt.imshow(env_theory_slice, extent=extent) +plt.colorbar() +plt.subplot(224) +plt.title("Difference") +plt.imshow(env - env_theory_slice, extent=extent) +plt.colorbar() +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_x = np.fft.fftfreq(F_laser.shape[0], dt) +freq_z = np.fft.fftfreq(F_laser.shape[1], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/analysis_rz.py b/Examples/Tests/laser_injection_from_file/analysis_rz.py new file mode 100755 index 00000000000..90e392bcf25 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/analysis_rz.py @@ -0,0 +1,144 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Compute the theory for laser envelope at time T +# - Compare theory and simulation in RZ, for both envelope and central frequency + +import os +import sys + +import matplotlib + +matplotlib.use("Agg") +import matplotlib.pyplot as plt +import numpy as np +import yt +from scipy.constants import c, epsilon_0 +from scipy.signal import hilbert + +yt.funcs.mylog.setLevel(50) + +sys.path.insert(1, "../../../../warpx/Regression/Checksum/") +import checksumAPI + +# Maximum acceptable error for this test +relative_error_threshold = 0.065 + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the gaussian beam +wavelength = 1.0 * um +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +laser_energy = 1.0 +E_max = np.sqrt( + 2 * (2 / np.pi) ** (3 / 2) * laser_energy / (epsilon_0 * w0**2 * c * tt) +) + + +# Function for the envelope +def gauss_env(T, X, Y, Z): + # Function to compute the theory for the envelope + inv_tau2 = 1.0 / tt / tt + inv_w_2 = 1.0 / (w0 * w0) + exp_arg = ( + -(X * X) * inv_w_2 + - (Y * Y) * inv_w_2 + - inv_tau2 / c / c * (Z - T * c) * (Z - T * c) + ) + return E_max * np.real(np.exp(exp_arg)) + + +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 252 +ds = yt.load(filename) +dt = ds.current_time.to_value() / steps + +# Define 3D meshes +x = np.linspace( + ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] +).v +y = np.linspace( + ds.domain_left_edge[1], ds.domain_right_edge[1], ds.domain_dimensions[1] +).v +z = np.linspace( + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_dimensions[ds.dimensionality - 1], +).v +X, Y, Z = np.meshgrid(x, y, z, sparse=False, indexing="ij") + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Y, Z) + gauss_env( + -t_c + ds.current_time.to_value(), X, Y, Z +) + +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Et"].v.squeeze() +env = abs(hilbert(F_laser)) +extent = [ + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_left_edge[0], + ds.domain_right_edge[0], +] + +env_theory_slice = env_theory[:, env_theory.shape[1] // 2, :] + +# Plot results +plt.figure(figsize=(8, 6)) +plt.subplot(221) +plt.title("PIC field") +plt.imshow(F_laser, extent=extent) +plt.colorbar() +plt.subplot(222) +plt.title("PIC envelope") +plt.imshow(env, extent=extent) +plt.colorbar() +plt.subplot(223) +plt.title("Theory envelope") +plt.imshow(env_theory_slice, extent=extent) +plt.colorbar() +plt.subplot(224) +plt.title("Difference") +plt.imshow(env - env_theory_slice, extent=extent) +plt.colorbar() +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory_slice)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fftn(F_laser) + +freq_x = np.fft.fftfreq(F_laser.shape[0], dt) +freq_z = np.fft.fftfreq(F_laser.shape[1], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.sqrt((freq_x[pos_max[0]]) ** 2 + (freq_z[pos_max[1]]) ** 2) +exp_freq = c / wavelength +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file index f92440188b7..5ec9b55b345 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file @@ -40,7 +40,7 @@ lasy_RZ_laser.e_max = 1.e14 # Maximum amplitude of the laser field lasy_RZ_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_RZ_laser.profile = from_file lasy_RZ_laser.time_chunk_size = 50 -lasy_RZ_laser.lasy_file_name = "diags/laguerrelaserRZ_00000.h5" +lasy_RZ_laser.lasy_file_name = "../test_rz_laser_injection_from_RZ_lasy_file_prepare/laguerre_laser_RZ_00000.h5" lasy_RZ_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py new file mode 100755 index 00000000000..1a1dfabe86e --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a Laguerre Gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import CombinedLongitudinalTransverseProfile +from lasy.profiles.longitudinal import GaussianLongitudinalProfile +from lasy.profiles.transverse import LaguerreGaussianTransverseProfile + +# Maximum acceptable error for this test +relative_error_threshold = 0.065 + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Laguerre Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +# Create a Laguerre Gaussian laser in RZ geometry using lasy +profile = CombinedLongitudinalTransverseProfile( + wavelength, + pol, + laser_energy, + GaussianLongitudinalProfile(wavelength, tt, t_peak=0), + LaguerreGaussianTransverseProfile(w0, p=0, m=1), +) +dim = "rt" +lo = (0e-6, -20e-15) +hi = (+25e-6, +20e-15) +npoints = (100, 100) +laser = Laser(dim, lo, hi, npoints, profile, n_azimuthal_modes=2) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("laguerre_laser_RZ") diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file index 2a539883fec..b86fc8a98de 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file @@ -41,7 +41,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "diags/gaussianlaser3d_00000.h5" +lasy_laser.lasy_file_name = "../test_rz_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py new file mode 100755 index 00000000000..410dcd2c36e --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external lasy file: +# - Generate an input lasy file with a gaussian laser pulse. + +from lasy.laser import Laser +from lasy.profiles import GaussianProfile + +# Maximum acceptable error for this test +relative_error_threshold = 0.065 + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 + +# Parameters of the Gaussian beam +wavelength = 1.0 * um +pol = (1, 0) +laser_energy = 1.0 +w0 = 12.0 * um +tt = 10.0 * fs +t_c = 20.0 * fs + +# Create a laser using lasy +profile = GaussianProfile(wavelength, pol, laser_energy, w0, tt, t_peak=0) +dim = "xyt" +lo = (-25e-6, -25e-6, -20e-15) +hi = (+25e-6, +25e-6, +20e-15) +npoints = (100, 100, 100) +laser = Laser(dim, lo, hi, npoints, profile) +laser.normalize(laser_energy, kind="energy") +laser.write_to_file("gaussian_laser_3d") From 20f0e91a5220be84b930c84c456825bc431067ce Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 16:04:30 -0700 Subject: [PATCH 137/167] Add more tests --- .../laser_injection_from_file/CMakeLists.txt | 32 ++- .../analysis_2d_binary.py | 238 ++++++------------ ...s_test_2d_laser_injection_from_binary_file | 2 +- ...aser_injection_from_binary_file_prepare.py | 107 ++++++++ 4 files changed, 207 insertions(+), 172 deletions(-) create mode 100755 Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index e1c6d0bd957..b4cbe5194ad 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -1,17 +1,27 @@ # Add tests (alphabetical order) ############################################## # -# FIXME -#add_warpx_test( -# test_2d_laser_injection_from_binary_file # name -# 2 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs -# Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis -# diags/diag1000250 # output -# OFF # dependency -#) +add_warpx_test( + test_2d_laser_injection_from_binary_file_prepare # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency +) + +add_warpx_test( + test_2d_laser_injection_from_binary_file # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs + Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis + diags/diag1000250 # output + test_2d_laser_injection_from_binary_file_prepare # dependency +) add_warpx_test( test_1d_laser_injection_from_lasy_file_prepare # name diff --git a/Examples/Tests/laser_injection_from_file/analysis_2d_binary.py b/Examples/Tests/laser_injection_from_file/analysis_2d_binary.py index 44030261732..bcb13bba410 100755 --- a/Examples/Tests/laser_injection_from_file/analysis_2d_binary.py +++ b/Examples/Tests/laser_injection_from_file/analysis_2d_binary.py @@ -9,14 +9,10 @@ # This file is part of the WarpX automated test suite. It is used to test the -# injection of a laser pulse from an external binary file. -# -# - Generate an input binary file with a gaussian laser pulse. -# - Run the WarpX simulation for time T, when the pulse is fully injected +# injection of a laser pulse from an external binary file: # - Compute the theory for laser envelope at time T # - Compare theory and simulation in 2D, for both envelope and central frequency -import glob import os import sys @@ -62,30 +58,6 @@ xcoords = np.linspace(x_l, x_r, x_points) -def gauss(T, X, Y, opt): - """Compute the electric field for a Gaussian laser pulse. - This is used to write the binary input file. - """ - - k0 = 2.0 * np.pi / wavelength - inv_tau2 = 1.0 / tt / tt - osc_phase = k0 * c * (T - t_c) - - diff_factor = 1.0 + 1.0j * foc_dist * 2 / (k0 * w0 * w0) - inv_w_2 = 1.0 / (w0 * w0 * diff_factor) - - pre_fact = np.exp(1.0j * osc_phase) - - if opt == "3d": - pre_fact = pre_fact / diff_factor - else: - pre_fact = pre_fact / np.sqrt(diff_factor) - - exp_arg = -(X * X + Y * Y) * inv_w_2 - inv_tau2 * (T - t_c) * (T - t_c) - - return np.real(pre_fact * np.exp(exp_arg)) - - # Function for the envelope def gauss_env(T, XX, ZZ): """Function to compute the theory for the envelope""" @@ -99,134 +71,80 @@ def gauss_env(T, XX, ZZ): return E_max * np.real(np.exp(exp_arg)) -def write_file(fname, x, y, t, E): - """For a given filename fname, space coordinates x and y, time coordinate t - and field E, write a WarpX-compatible input binary file containing the - profile of the laser pulse. This function should be used in the case - of a uniform spatio-temporal mesh - """ - - with open(fname, "wb") as file: - flag_unif = 1 - file.write(flag_unif.to_bytes(1, byteorder="little")) - file.write((len(t)).to_bytes(4, byteorder="little", signed=False)) - file.write((len(x)).to_bytes(4, byteorder="little", signed=False)) - file.write((len(y)).to_bytes(4, byteorder="little", signed=False)) - file.write(t[0].tobytes()) - file.write(t[-1].tobytes()) - file.write(x[0].tobytes()) - file.write(x[-1].tobytes()) - if len(y) == 1: - file.write(y[0].tobytes()) - else: - file.write(y[0].tobytes()) - file.write(y[-1].tobytes()) - file.write(E.tobytes()) - - -def create_gaussian_2d(): - T, X, Y = np.meshgrid(tcoords, xcoords, np.array([0.0]), indexing="ij") - E_t = gauss(T, X, Y, "2d") - write_file("gauss_2d", xcoords, np.array([0.0]), tcoords, E_t) - - -def do_analysis(fname, compname, steps): - ds = yt.load(fname) - - dt = ds.current_time.to_value() / steps - - # Define 2D meshes - x = np.linspace( - ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] - ).v - z = np.linspace( - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_dimensions[ds.dimensionality - 1], - ).v - X, Z = np.meshgrid(x, z, sparse=False, indexing="ij") - - # Compute the theory for envelope - env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Z) + gauss_env( - -t_c + ds.current_time.to_value(), X, Z - ) - - # Read laser field in PIC simulation, and compute envelope - all_data_level_0 = ds.covering_grid( - level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions - ) - F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() - env = abs(hilbert(F_laser)) - extent = [ - ds.domain_left_edge[ds.dimensionality - 1], - ds.domain_right_edge[ds.dimensionality - 1], - ds.domain_left_edge[0], - ds.domain_right_edge[0], - ] - - # Plot results - plt.figure(figsize=(8, 6)) - plt.subplot(221) - plt.title("PIC field") - plt.imshow(F_laser, extent=extent) - plt.colorbar() - plt.subplot(222) - plt.title("PIC envelope") - plt.imshow(env, extent=extent) - plt.colorbar() - plt.subplot(223) - plt.title("Theory envelope") - plt.imshow(env_theory, extent=extent) - plt.colorbar() - plt.subplot(224) - plt.title("Difference") - plt.imshow(env - env_theory, extent=extent) - plt.colorbar() - plt.tight_layout() - plt.savefig(compname, bbox_inches="tight") - - relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) - print("Relative error envelope: ", relative_error_env) - assert relative_error_env < relative_error_threshold - - fft_F_laser = np.fft.fft2(F_laser) - - freq_rows = np.fft.fftfreq(F_laser.shape[0], dt) - freq_cols = np.fft.fftfreq(F_laser.shape[1], dt) - - pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) - - freq = np.sqrt((freq_rows[pos_max[0]]) ** 2 + (freq_cols[pos_max[1]] ** 2)) - exp_freq = c / wavelength - - relative_error_freq = np.abs(freq - exp_freq) / exp_freq - print("Relative error frequency: ", relative_error_freq) - assert relative_error_freq < relative_error_threshold - - -def launch_analysis(executable): - create_gaussian_2d() - os.system( - "./" - + executable - + " inputs.2d_test_binary diag1.file_prefix=diags/plotfiles/plt" - ) - do_analysis("diags/plotfiles/plt000250/", "comp_unf.pdf", 250) - - -def main(): - executables = glob.glob("*.ex") - if len(executables) == 1: - launch_analysis(executables[0]) - else: - assert False - - # Do the checksum test - filename_end = "diags/plotfiles/plt000250/" - test_name = "LaserInjectionFromBINARYFile" - checksumAPI.evaluate_checksum(test_name, filename_end) - print("Passed") - - -if __name__ == "__main__": - main() +filename = sys.argv[1] +compname = "comp_unf.pdf" +steps = 250 +ds = yt.load(filename) + +dt = ds.current_time.to_value() / steps + +# Define 2D meshes +x = np.linspace( + ds.domain_left_edge[0], ds.domain_right_edge[0], ds.domain_dimensions[0] +).v +z = np.linspace( + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_dimensions[ds.dimensionality - 1], +).v +X, Z = np.meshgrid(x, z, sparse=False, indexing="ij") + +# Compute the theory for envelope +env_theory = gauss_env(+t_c - ds.current_time.to_value(), X, Z) + gauss_env( + -t_c + ds.current_time.to_value(), X, Z +) + +# Read laser field in PIC simulation, and compute envelope +all_data_level_0 = ds.covering_grid( + level=0, left_edge=ds.domain_left_edge, dims=ds.domain_dimensions +) +F_laser = all_data_level_0["boxlib", "Ey"].v.squeeze() +env = abs(hilbert(F_laser)) +extent = [ + ds.domain_left_edge[ds.dimensionality - 1], + ds.domain_right_edge[ds.dimensionality - 1], + ds.domain_left_edge[0], + ds.domain_right_edge[0], +] + +# Plot results +plt.figure(figsize=(8, 6)) +plt.subplot(221) +plt.title("PIC field") +plt.imshow(F_laser, extent=extent) +plt.colorbar() +plt.subplot(222) +plt.title("PIC envelope") +plt.imshow(env, extent=extent) +plt.colorbar() +plt.subplot(223) +plt.title("Theory envelope") +plt.imshow(env_theory, extent=extent) +plt.colorbar() +plt.subplot(224) +plt.title("Difference") +plt.imshow(env - env_theory, extent=extent) +plt.colorbar() +plt.tight_layout() +plt.savefig(compname, bbox_inches="tight") + +relative_error_env = np.sum(np.abs(env - env_theory)) / np.sum(np.abs(env)) +print("Relative error envelope: ", relative_error_env) +assert relative_error_env < relative_error_threshold + +fft_F_laser = np.fft.fft2(F_laser) + +freq_rows = np.fft.fftfreq(F_laser.shape[0], dt) +freq_cols = np.fft.fftfreq(F_laser.shape[1], dt) + +pos_max = np.unravel_index(np.abs(fft_F_laser).argmax(), fft_F_laser.shape) + +freq = np.sqrt((freq_rows[pos_max[0]]) ** 2 + (freq_cols[pos_max[1]] ** 2)) +exp_freq = c / wavelength + +relative_error_freq = np.abs(freq - exp_freq) / exp_freq +print("Relative error frequency: ", relative_error_freq) +assert relative_error_freq < relative_error_threshold + +test_name = os.path.split(os.getcwd())[1] +checksumAPI.evaluate_checksum(test_name, filename) diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file index fdb19f406ca..022da5b0e29 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file @@ -40,7 +40,7 @@ binary_laser.polarization = 0. 1. 0. # The main polarization vector binary_laser.e_max = 1.e12 # Maximum amplitude of the laser field (in V/m) binary_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) binary_laser.profile = from_file -binary_laser.binary_file_name = "gauss_2d" +binary_laser.binary_file_name = "../test_2d_laser_injection_from_binary_file_prepare/gauss_2d" binary_laser.time_chunk_size = 50 binary_laser.delay = 0.0 diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py new file mode 100755 index 00000000000..d8fe2236ae0 --- /dev/null +++ b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py @@ -0,0 +1,107 @@ +#!/usr/bin/env python3 + +# Copyright 2020 Andrew Myers, Axel Huebl, Luca Fedeli +# Remi Lehe, Ilian Kara-Mostefa +# +# This file is part of WarpX. +# +# License: BSD-3-Clause-LBNL + + +# This file is part of the WarpX automated test suite. It is used to test the +# injection of a laser pulse from an external binary file: +# - Generate an input binary file with a gaussian laser pulse. + +import sys + +import matplotlib + +matplotlib.use("Agg") +import numpy as np +import yt + +yt.funcs.mylog.setLevel(50) + +sys.path.insert(1, "../../../../warpx/Regression/Checksum/") + +# Maximum acceptable error for this test +relative_error_threshold = 0.065 + +# Physical parameters +um = 1.0e-6 +fs = 1.0e-15 +c = 299792458 + +# Parameters of the gaussian beam +wavelength = 1.0 * um +w0 = 6.0 * um +tt = 10.0 * fs +x_c = 0.0 * um +t_c = 20.0 * fs +foc_dist = 10 * um +E_max = 1e12 +rot_angle = -np.pi / 4.0 + +# Parameters of the tx grid +x_l = -12.0 * um +x_r = 12.0 * um +x_points = 480 +t_l = 0.0 * fs +t_r = 40.0 * fs +t_points = 400 +tcoords = np.linspace(t_l, t_r, t_points) +xcoords = np.linspace(x_l, x_r, x_points) + + +def gauss(T, X, Y, opt): + """Compute the electric field for a Gaussian laser pulse. + This is used to write the binary input file. + """ + + k0 = 2.0 * np.pi / wavelength + inv_tau2 = 1.0 / tt / tt + osc_phase = k0 * c * (T - t_c) + + diff_factor = 1.0 + 1.0j * foc_dist * 2 / (k0 * w0 * w0) + inv_w_2 = 1.0 / (w0 * w0 * diff_factor) + + pre_fact = np.exp(1.0j * osc_phase) + + if opt == "3d": + pre_fact = pre_fact / diff_factor + else: + pre_fact = pre_fact / np.sqrt(diff_factor) + + exp_arg = -(X * X + Y * Y) * inv_w_2 - inv_tau2 * (T - t_c) * (T - t_c) + + return np.real(pre_fact * np.exp(exp_arg)) + + +def write_file(fname, x, y, t, E): + """For a given filename fname, space coordinates x and y, time coordinate t + and field E, write a WarpX-compatible input binary file containing the + profile of the laser pulse. This function should be used in the case + of a uniform spatio-temporal mesh + """ + + with open(fname, "wb") as file: + flag_unif = 1 + file.write(flag_unif.to_bytes(1, byteorder="little")) + file.write((len(t)).to_bytes(4, byteorder="little", signed=False)) + file.write((len(x)).to_bytes(4, byteorder="little", signed=False)) + file.write((len(y)).to_bytes(4, byteorder="little", signed=False)) + file.write(t[0].tobytes()) + file.write(t[-1].tobytes()) + file.write(x[0].tobytes()) + file.write(x[-1].tobytes()) + if len(y) == 1: + file.write(y[0].tobytes()) + else: + file.write(y[0].tobytes()) + file.write(y[-1].tobytes()) + file.write(E.tobytes()) + + +T, X, Y = np.meshgrid(tcoords, xcoords, np.array([0.0]), indexing="ij") +E_t = gauss(T, X, Y, "2d") +write_file("gauss_2d", xcoords, np.array([0.0]), tcoords, E_t) From bc01fb5a934fd03dbe7225bef62c25c30bc22f44 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 16:27:21 -0700 Subject: [PATCH 138/167] Fix Langmuir tests --- Examples/Tests/langmuir/CMakeLists.txt | 25 ++++++++++++------------- Examples/Tests/langmuir/analysis_1d.py | 8 +++++--- Examples/Tests/langmuir/analysis_2d.py | 13 ++++++++----- Examples/Tests/langmuir/analysis_3d.py | 17 +++++++++-------- Examples/Tests/langmuir/analysis_rz.py | 3 ++- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index fe5450b6798..085521058f0 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -184,19 +184,18 @@ if(WarpX_FFT) ) endif() -# FIXME -#if(WarpX_FFT) -# add_warpx_test( -# test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # name -# 2 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs -# Examples/Tests/langmuir/analysis_2d.py # analysis -# diags/diag1000080 # output -# OFF # dependency -# ) -#endif() +if(WarpX_FFT) + add_warpx_test( + test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs + Examples/Tests/langmuir/analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency + ) +endif() if(WarpX_FFT) add_warpx_test( diff --git a/Examples/Tests/langmuir/analysis_1d.py b/Examples/Tests/langmuir/analysis_1d.py index 3ba21751671..d041ca03b36 100755 --- a/Examples/Tests/langmuir/analysis_1d.py +++ b/Examples/Tests/langmuir/analysis_1d.py @@ -29,14 +29,17 @@ sys.path.insert(1, "../../../../warpx/Regression/Checksum/") import checksumAPI +# test name +test_name = os.path.split(os.getcwd())[1] + # this will be the name of the plot file fn = sys.argv[1] # Parse test name and check if current correction (psatd.current_correction=1) is applied -current_correction = True if re.search("current_correction", fn) else False +current_correction = True if re.search("current_correction", test_name) else False # Parse test name and check if Vay current deposition (algo.current_deposition=vay) is used -vay_deposition = True if re.search("Vay_deposition", fn) else False +vay_deposition = True if re.search("vay_deposition", test_name) else False # Parameters (these parameters must match the parameters in `inputs.multi.rt`) epsilon = 0.01 @@ -123,5 +126,4 @@ def get_theoretical_field(field, t): print("tolerance = {}".format(tolerance)) assert error_rel < tolerance -test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/Tests/langmuir/analysis_2d.py b/Examples/Tests/langmuir/analysis_2d.py index 8914b8b426c..ac98354c73b 100755 --- a/Examples/Tests/langmuir/analysis_2d.py +++ b/Examples/Tests/langmuir/analysis_2d.py @@ -29,19 +29,23 @@ sys.path.insert(1, "../../../../warpx/Regression/Checksum/") import checksumAPI +# test name +test_name = os.path.split(os.getcwd())[1] + # this will be the name of the plot file fn = sys.argv[1] # Parse test name and check if current correction (psatd.current_correction=1) is applied -current_correction = True if re.search("current_correction", fn) else False +current_correction = True if re.search("current_correction", test_name) else False # Parse test name and check if Vay current deposition (algo.current_deposition=vay) is used -vay_deposition = True if re.search("Vay_deposition", fn) else False +vay_deposition = True if re.search("vay_deposition", test_name) else False # Parse test name and check if particle_shape = 4 is used -particle_shape_4 = True if re.search("particle_shape_4", fn) else False +particle_shape_4 = True if re.search("particle_shape_4", test_name) else False -# Parameters (these parameters must match the parameters in `inputs.multi.rt`) +# Parameters (must match the parameters in the inputs) +# FIXME read these parameters from warpx_used_inputs epsilon = 0.01 n = 4.0e24 n_osc_x = 2 @@ -159,5 +163,4 @@ def get_theoretical_field(field, t): print("tolerance = {}".format(tolerance)) assert error_rel < tolerance -test_name = os.path.split(os.getcwd())[1] checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/Tests/langmuir/analysis_3d.py b/Examples/Tests/langmuir/analysis_3d.py index 6fd58e62de4..9f4b2cc1f93 100755 --- a/Examples/Tests/langmuir/analysis_3d.py +++ b/Examples/Tests/langmuir/analysis_3d.py @@ -29,17 +29,20 @@ sys.path.insert(1, "../../../../warpx/Regression/Checksum/") import checksumAPI +# test name +test_name = os.path.split(os.getcwd())[1] + # this will be the name of the plot file fn = sys.argv[1] # Parse test name and check if current correction (psatd.current_correction=1) is applied -current_correction = True if re.search("current_correction", fn) else False +current_correction = True if re.search("current_correction", test_name) else False # Parse test name and check if Vay current deposition (algo.current_deposition=vay) is used -vay_deposition = True if re.search("Vay_deposition", fn) else False +vay_deposition = True if re.search("vay_deposition", test_name) else False # Parse test name and check if div(E)/div(B) cleaning (warpx.do_div_cleaning=1) is used -div_cleaning = True if re.search("div_cleaning", fn) else False +div_cleaning = True if re.search("div_cleaning", test_name) else False # Parameters (these parameters must match the parameters in `inputs.multi.rt`) epsilon = 0.01 @@ -178,8 +181,8 @@ def get_theoretical_field(field, t): assert error_rel < tolerance if div_cleaning: - ds_old = yt.load("Langmuir_multi_psatd_div_cleaning_plt000038") - ds_mid = yt.load("Langmuir_multi_psatd_div_cleaning_plt000039") + ds_old = yt.load("diags/diag1000038") + ds_mid = yt.load("diags/diag1000039") ds_new = yt.load(fn) # this is the last plotfile ad_old = ds_old.covering_grid( @@ -209,9 +212,7 @@ def get_theoretical_field(field, t): print("tolerance = {}".format(tolerance)) assert error_rel < tolerance -test_name = os.path.split(os.getcwd())[1] - -if re.search("single_precision", fn): +if re.search("single_precision", test_name): checksumAPI.evaluate_checksum(test_name, fn, rtol=1.0e-3) else: checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/Tests/langmuir/analysis_rz.py b/Examples/Tests/langmuir/analysis_rz.py index 792394ea573..dd26fd29db7 100755 --- a/Examples/Tests/langmuir/analysis_rz.py +++ b/Examples/Tests/langmuir/analysis_rz.py @@ -35,10 +35,11 @@ # this will be the name of the plot file fn = sys.argv[1] +# test name test_name = os.path.split(os.getcwd())[1] # Parse test name and check if current correction (psatd.current_correction) is applied -current_correction = True if re.search("current_correction", fn) else False +current_correction = True if re.search("current_correction", test_name) else False # Parameters (these parameters must match the parameters in `inputs.multi.rz.rt`) epsilon = 0.01 From 5185679d205e3d8fb526e784a27debe76642875b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 16:48:37 -0700 Subject: [PATCH 139/167] Add more tests --- .../pass_mpi_communicator/CMakeLists.txt | 25 ++++++------ .../inputs_test_2d_pass_mpi_comm_picmi.py | 1 - Examples/Tests/restart/CMakeLists.txt | 38 +++++++++++++------ ...inputs_test_2d_runtime_components_picmi.py | 12 +----- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index 33306b8a304..34a903dcc12 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -1,14 +1,17 @@ # Add tests (alphabetical order) ############################################## # -# FIXME -#add_warpx_test( -# test_2d_pass_mpi_comm_picmi # name -# 2 # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs -# Examples/Tests/pass_mpi_communicator/analysis.py # analysis -# diags/diag1000010 # output -# OFF # dependency -#) +# TODO +# - Enable in pyAMReX (https://github.com/AMReX-Codes/pyamrex/issues/163) +# - Enable related lines in input script +# - Enable analysis script +add_warpx_test( + test_2d_pass_mpi_comm_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs + OFF #Examples/Tests/pass_mpi_communicator/analysis.py # analysis + OFF # output + OFF # dependency +) diff --git a/Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py b/Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py index 55ebf64d8e6..200cea7be0f 100755 --- a/Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py +++ b/Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py @@ -91,7 +91,6 @@ grid=grid, period=diagnostic_intervals, data_list=["Ex", "Jx"], - write_dir=".", warpx_file_prefix=f"Python_pass_mpi_comm_plt{color + 1}_", ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 5f990f0663f..4fee067f0e9 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -12,17 +12,33 @@ add_warpx_test( OFF # dependency ) -# FIXME -#add_warpx_test( -# test_2d_runtime_components_picmi # name -# 2 # dims -# 1 # nprocs -# OFF # eb -# Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs -# Examples/analysis_default_regression.py # analysis -# diags/diag1000010 # output -# OFF # dependency -#) +# TODO +# - Add checksums file +# - Enable analysis +add_warpx_test( + test_2d_runtime_components_picmi # name + 2 # dims + 1 # nprocs + OFF # eb + Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs + OFF #Examples/analysis_default_regression.py # analysis + OFF #diags/diag1000010 # output + OFF # dependency +) + +# TODO +# - Add checksums file +# - Enable analysis +add_warpx_test( + test_2d_runtime_components_picmi_restart # name + 2 # dims + 1 # nprocs + OFF # eb + "Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py amr.restart=../test_2d_runtime_components_picmi/diags/chk000005" # inputs + OFF #Examples/analysis_default_regression.py # analysis + OFF #diags/diag1000010 # output + test_2d_runtime_components_picmi # dependency +) add_warpx_test( test_3d_acceleration # name diff --git a/Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py b/Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py index 3061a3c1ff6..e90bfd266a7 100755 --- a/Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py +++ b/Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py @@ -66,25 +66,15 @@ particle_diag = picmi.ParticleDiagnostic( name="diag1", period=10, - write_dir=".", - warpx_file_prefix="Python_restart_runtime_components_plt", ) field_diag = picmi.FieldDiagnostic( name="diag1", grid=grid, period=10, data_list=["phi"], - write_dir=".", - warpx_file_prefix="Python_restart_runtime_components_plt", ) -checkpoint = picmi.Checkpoint( - name="chkpoint", - period=5, - write_dir=".", - warpx_file_min_digits=5, - warpx_file_prefix="Python_restart_runtime_components_chk", -) +checkpoint = picmi.Checkpoint(name="chk", period=5) ########################## # simulation setup From 9bb47705c192ecc902ad4b47f70ad0af43eff763 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 17:08:48 -0700 Subject: [PATCH 140/167] Fix Python script for inputs check --- .github/workflows/source/check_inputs.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/source/check_inputs.py b/.github/workflows/source/check_inputs.py index 5f22091ecb5..3cb2d8f735e 100755 --- a/.github/workflows/source/check_inputs.py +++ b/.github/workflows/source/check_inputs.py @@ -56,13 +56,13 @@ wrong_testname = True # PICMI tests if "picmi" in testname: - if not testname.endswith("_picmi"): + if not testname.endswith("_picmi") and not testname.endswith("_picmi_restart"): print(f"Wrong test name: {testname}") print(f"(from {testpath})") wrong_testname = True # restart tests if "restart" in testname: - if not testname.endswith("_restart") and not testname.endswith("_restart.py"): + if not testname.endswith("_restart"): print(f"Wrong test name: {testname}") print(f"(from {testpath})") wrong_testname = True @@ -71,8 +71,10 @@ not testinput == f"inputs_{testname}" and not testinput == f"inputs_{testname}.py" ): - # we may be using a base input file/script - if not testinput.startswith("inputs_base"): + # we may be running a base input file/script or a restart PICMI test + if not testinput.startswith("inputs_base") and not testinput.endswith( + "_picmi.py" + ): print(f"Wrong input name: {testinput}") print(f"(from {testpath})") wrong_testinput = True From ba7fdb348242da94090126645406150cb5a6faec Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 17:57:21 -0700 Subject: [PATCH 141/167] Add more tests --- Examples/Tests/CMakeLists.txt | 2 ++ .../initial_plasma_profile/CMakeLists.txt | 13 ++++++++++ Examples/Tests/restart_eb/CMakeLists.txt | 25 +++++++++++++++++++ .../restart_eb/inputs_test_3d_eb_picmi.py | 9 +------ ...rt_eb_picmi.json => test_3d_eb_picmi.json} | 0 5 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 Examples/Tests/initial_plasma_profile/CMakeLists.txt create mode 100644 Examples/Tests/restart_eb/CMakeLists.txt rename Regression/Checksum/benchmarks_json/{test_3d_restart_eb_picmi.json => test_3d_eb_picmi.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 2a350310e75..62b8fc90baf 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -23,6 +23,7 @@ add_subdirectory(flux_injection) add_subdirectory(gaussian_beam) add_subdirectory(implicit) add_subdirectory(initial_distribution) +add_subdirectory(initial_plasma_profile) add_subdirectory(ionization) add_subdirectory(ion_stopping) add_subdirectory(langmuir) @@ -65,6 +66,7 @@ add_subdirectory(relativistic_space_charge_initialization) add_subdirectory(repelling_particles) add_subdirectory(resampling) add_subdirectory(restart) +add_subdirectory(restart_eb) add_subdirectory(rigid_injection) add_subdirectory(scraping) add_subdirectory(silver_mueller) diff --git a/Examples/Tests/initial_plasma_profile/CMakeLists.txt b/Examples/Tests/initial_plasma_profile/CMakeLists.txt new file mode 100644 index 00000000000..c54e73d617e --- /dev/null +++ b/Examples/Tests/initial_plasma_profile/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_2d_parabolic_channel_initialization # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/initial_plasma_profile/inputs_test_2d_parabolic_channel_initialization # inputs + Examples/Tests/initial_plasma_profile/analysis.py # analysis + diags/diag1000001 # output + OFF # dependency +) diff --git a/Examples/Tests/restart_eb/CMakeLists.txt b/Examples/Tests/restart_eb/CMakeLists.txt new file mode 100644 index 00000000000..27ead34c389 --- /dev/null +++ b/Examples/Tests/restart_eb/CMakeLists.txt @@ -0,0 +1,25 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_3d_eb_picmi # name + 3 # dims + 1 # nprocs + ON # eb + Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000060 # output + OFF # dependency +) + +# FIXME +#add_warpx_test( +# test_3d_eb_picmi_restart # name +# 3 # dims +# 1 # nprocs +# ON # eb +# "Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py amr.restart=../test_3d_eb_picmi/diags/chk000030" # inputs +# Examples/analysis_default_regression.py # analysis +# diags/diag1000060 # output +# test_3d_eb_picmi # dependency +#) diff --git a/Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py b/Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py index 0cfd0bcff5f..0f701ba999b 100755 --- a/Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py +++ b/Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py @@ -80,24 +80,17 @@ particle_diag = picmi.ParticleDiagnostic( name="diag1", period=diagnostic_intervals, - write_dir=".", - warpx_file_prefix="Python_restart_eb_plt", ) field_diag = picmi.FieldDiagnostic( name="diag1", grid=grid, period=diagnostic_intervals, data_list=["Ex", "Ey", "Ez", "Bx", "By", "Bz"], - write_dir=".", - warpx_file_prefix="Python_restart_eb_plt", ) checkpoint = picmi.Checkpoint( - name="chkpoint", + name="chk", period=diagnostic_intervals, - write_dir=".", - warpx_file_min_digits=5, - warpx_file_prefix="Python_restart_eb_chk", ) ########################## diff --git a/Regression/Checksum/benchmarks_json/test_3d_restart_eb_picmi.json b/Regression/Checksum/benchmarks_json/test_3d_eb_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/test_3d_restart_eb_picmi.json rename to Regression/Checksum/benchmarks_json/test_3d_eb_picmi.json From b7b4733c5f3afeed51d6875fb9bdfce76ec18814 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 27 Aug 2024 18:09:06 -0700 Subject: [PATCH 142/167] Remove obsolete scripts for inputs check --- .github/workflows/source/inputsNotTested | 37 ------------- .../workflows/source/wrongFileNameInExamples | 52 ------------------- 2 files changed, 89 deletions(-) delete mode 100755 .github/workflows/source/inputsNotTested delete mode 100755 .github/workflows/source/wrongFileNameInExamples diff --git a/.github/workflows/source/inputsNotTested b/.github/workflows/source/inputsNotTested deleted file mode 100755 index a1cd256e504..00000000000 --- a/.github/workflows/source/inputsNotTested +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -# Search input files in Examples/ and verify if all input files are tested - -set -eu -o pipefail - -ok=0 - -# all calls to add_warpx_test(...) in CMakeLists.txt files -registered_tests=$(grep -h -R -A5 "add_warpx_test" Examples/ | grep Examples) -# FIXME we should exclude tests whose line starts with '#' (test commented out) - -# go through each input file -for file in $(find Examples -type f) -do - # Name of file without path - filename=$(basename $file) - # If file is a test input file - if [[ ${filename:0:11 } =~ inputs_test ]] - then - # Search file name in test list - if [[ "${registered_tests}" != *"${file}"* ]] - then - echo "$file is not tested!" - ok=1 - fi - fi -done - -if [ $ok -ne 0 ] -then - echo "" - echo "All files in Examples/ starting with 'inputs_test' must have an automated test." - echo "Please add a test in the corresponding CMakeLists.txt for all files listed above." -fi - -exit $ok diff --git a/.github/workflows/source/wrongFileNameInExamples b/.github/workflows/source/wrongFileNameInExamples deleted file mode 100755 index 156325701d6..00000000000 --- a/.github/workflows/source/wrongFileNameInExamples +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash -# -# Search inside Examples/ and check that file names start with -# inputs -# PICMI_inputs -# analysis -# README - -set -eu -o pipefail - -ok=0 -files=() - -for pathtofile in $(find Examples -type f) -do - file=$(basename $pathtofile) - if [[ ${file:0:14} != inputs_base_1d ]] && - [[ ${file:0:14} != inputs_base_2d ]] && - [[ ${file:0:14} != inputs_base_3d ]] && - [[ ${file:0:14} != inputs_base_rz ]] && - [[ ${file:0:14} != inputs_test_1d ]] && - [[ ${file:0:14} != inputs_test_2d ]] && - [[ ${file:0:14} != inputs_test_3d ]] && - [[ ${file:0:14} != inputs_test_rz ]] && - [[ ${file:0:8 } != analysis ]] && - [[ ${file:0:8 } != catalyst ]] && - [[ ${file: -4} != yaml ]] && - [[ ${file:0:4 } != plot ]] && - [[ ${file:0:6 } != README ]] && - [[ ${file:0:10} != CMakeLists ]] - then - files+=($file) - echo "$pathtofile does not have a proper name!" - ok=1 - fi -done - -if [ $ok -ne 0 ] -then - echo "" - echo "Files in Examples/ must start with one of:" - echo " - inputs_base_<1d;2d;3d;rz>: for base input files" - echo " - inputs_test_<1d;2d;3d;rz>: for test input files" - echo " - analysis : for analysis scripts" - echo " - *.yaml : for third-party inputs, e.g., Ascent in-situ visualization" - echo " - README : for README files" - echo " - CMakeLists : for CMake files" - echo "" - echo "Please rename the file(s) to comply, or move to another folder" -fi - -exit $ok From a202748957e02539522115fa205f436ea8dc4fce Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 28 Aug 2024 08:46:49 -0700 Subject: [PATCH 143/167] Debugging LASY tests --- .azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index daa3b01763b..01a91ba8407 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -154,7 +154,9 @@ jobs: # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) - ctest --test-dir build --output-on-failure -E AMReX + # FIXME debug + ctest --test-dir build --output-on-failure -E AMReX -R lasy --verbose + #ctest --test-dir build --output-on-failure -E AMReX rm -rf build #rm -rf ${WARPX_CI_TMP} df -h From d32b3d37b4706b0fe60ee2fbba4bddefdcc0033a Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 28 Aug 2024 10:40:51 -0700 Subject: [PATCH 144/167] Add missing tests --- Examples/Tests/CMakeLists.txt | 1 + Examples/Tests/diff_lumi_diag/CMakeLists.txt | 13 +++++++++++++ .../{inputs => inputs_test_3d_diff_lumi_diag} | 0 ...f_lumi_diag.json => test_3d_diff_lumi_diag.json} | 0 4 files changed, 14 insertions(+) create mode 100644 Examples/Tests/diff_lumi_diag/CMakeLists.txt rename Examples/Tests/diff_lumi_diag/{inputs => inputs_test_3d_diff_lumi_diag} (100%) rename Regression/Checksum/benchmarks_json/{diff_lumi_diag.json => test_3d_diff_lumi_diag.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 62b8fc90baf..3ec88e05449 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -7,6 +7,7 @@ add_subdirectory(boundaries) add_subdirectory(btd_rz) add_subdirectory(collider_relevant_diags) add_subdirectory(collision) +add_subdirectory(diff_lumi_diag) add_subdirectory(divb_cleaning) add_subdirectory(dive_cleaning) add_subdirectory(electrostatic_dirichlet_bc) diff --git a/Examples/Tests/diff_lumi_diag/CMakeLists.txt b/Examples/Tests/diff_lumi_diag/CMakeLists.txt new file mode 100644 index 00000000000..2c2785bbdf2 --- /dev/null +++ b/Examples/Tests/diff_lumi_diag/CMakeLists.txt @@ -0,0 +1,13 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_3d_diff_lumi_diag # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/diff_lumi_diag/inputs_test_3d_diff_lumi_diag # inputs + Examples/Tests/diff_lumi_diag/analysis.py # analysis + diags/diag1000080 # output + OFF # dependency +) diff --git a/Examples/Tests/diff_lumi_diag/inputs b/Examples/Tests/diff_lumi_diag/inputs_test_3d_diff_lumi_diag similarity index 100% rename from Examples/Tests/diff_lumi_diag/inputs rename to Examples/Tests/diff_lumi_diag/inputs_test_3d_diff_lumi_diag diff --git a/Regression/Checksum/benchmarks_json/diff_lumi_diag.json b/Regression/Checksum/benchmarks_json/test_3d_diff_lumi_diag.json similarity index 100% rename from Regression/Checksum/benchmarks_json/diff_lumi_diag.json rename to Regression/Checksum/benchmarks_json/test_3d_diff_lumi_diag.json From fa021529a6200db106cec6a32e0aa7a126905c88 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 28 Aug 2024 10:42:44 -0700 Subject: [PATCH 145/167] Fix restart tests --- .../uniform_plasma/CMakeLists.txt | 2 +- .../Tests/load_external_field/CMakeLists.txt | 4 ++-- Examples/Tests/pml/CMakeLists.txt | 4 ++-- Examples/Tests/restart/CMakeLists.txt | 8 +++---- Examples/Tests/restart_eb/CMakeLists.txt | 2 +- Examples/analysis_default_regression.py | 12 ++-------- Examples/analysis_default_restart.py | 23 ++++++++++++++++--- 7 files changed, 32 insertions(+), 23 deletions(-) diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index 65eb0060d78..87379f357e0 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -29,7 +29,7 @@ add_warpx_test( 2 # nprocs OFF # eb Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_uniform_plasma # dependency ) diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 3cd434dcdda..a54bcfabb88 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -40,7 +40,7 @@ add_warpx_test( 1 # nprocs OFF # eb Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000300 # output test_rz_load_external_field_grid # dependency ) @@ -62,7 +62,7 @@ add_warpx_test( 1 # nprocs OFF # eb Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000300 # output test_rz_load_external_field_particles # dependency ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 66e513136a8..8b5943999c3 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -66,7 +66,7 @@ add_warpx_test( 2 # nprocs OFF # eb Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000300 # output test_2d_pml_x_psatd # dependency ) @@ -88,7 +88,7 @@ add_warpx_test( 2 # nprocs OFF # eb Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000300 # output test_2d_pml_x_yee # dependency ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 4fee067f0e9..25ea66312bd 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -35,7 +35,7 @@ add_warpx_test( 1 # nprocs OFF # eb "Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py amr.restart=../test_2d_runtime_components_picmi/diags/chk000005" # inputs - OFF #Examples/analysis_default_regression.py # analysis + OFF #Examples/analysis_default_restart.py # analysis OFF #diags/diag1000010 # output test_2d_runtime_components_picmi # dependency ) @@ -57,7 +57,7 @@ add_warpx_test( 2 # nprocs OFF # eb Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration # dependency ) @@ -82,7 +82,7 @@ if(WarpX_FFT) 2 # nprocs OFF # eb Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration_psatd # dependency ) @@ -108,7 +108,7 @@ if(WarpX_FFT) 2 # nprocs OFF # eb Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs - Examples/analysis_default_regression.py # analysis + Examples/analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration_psatd_time_avg # dependency ) diff --git a/Examples/Tests/restart_eb/CMakeLists.txt b/Examples/Tests/restart_eb/CMakeLists.txt index 27ead34c389..d211c2114f7 100644 --- a/Examples/Tests/restart_eb/CMakeLists.txt +++ b/Examples/Tests/restart_eb/CMakeLists.txt @@ -19,7 +19,7 @@ add_warpx_test( # 1 # nprocs # ON # eb # "Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py amr.restart=../test_3d_eb_picmi/diags/chk000030" # inputs -# Examples/analysis_default_regression.py # analysis +# Examples/analysis_default_restart.py # analysis # diags/diag1000060 # output # test_3d_eb_picmi # dependency #) diff --git a/Examples/analysis_default_regression.py b/Examples/analysis_default_regression.py index b18cfcb5891..519bbeeea64 100755 --- a/Examples/analysis_default_regression.py +++ b/Examples/analysis_default_regression.py @@ -13,17 +13,9 @@ # Get name of the test test_name = os.path.split(os.getcwd())[1] -restart = "restart" in test_name - -if restart: - test_name = test_name.replace("_restart", "") - # Run checksum regression test if re.search("single_precision", fn): checksumAPI.evaluate_checksum(test_name, fn, rtol=2.0e-6) else: - if restart: - checksumAPI.evaluate_checksum(test_name, fn, rtol=1e-12) - else: - # using default relative tolerance - checksumAPI.evaluate_checksum(test_name, fn) + # using default relative tolerance + checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/analysis_default_restart.py b/Examples/analysis_default_restart.py index 30491ad59e9..55bab253dbc 100755 --- a/Examples/analysis_default_restart.py +++ b/Examples/analysis_default_restart.py @@ -1,8 +1,14 @@ #!/usr/bin/env python3 +import os +import sys + import numpy as np import yt +sys.path.insert(1, "../../../../warpx/Regression/Checksum/") +import checksumAPI + def check_restart(filename, tolerance=1e-12): """ @@ -31,7 +37,7 @@ def check_restart(filename, tolerance=1e-12): ) # Load output data generated from initial run - benchmark = "orig_" + filename + benchmark = os.path.join(os.getcwd().replace("_restart", ""), filename) ds_benchmark = yt.load(benchmark) # yt 4.0+ has rounding issues with our domain data: @@ -48,7 +54,7 @@ def check_restart(filename, tolerance=1e-12): # Loop over all fields (all particle species, all particle attributes, all grid fields) # and compare output data generated from initial run with output data generated after restart - print("\ntolerance = {:g}".format(tolerance)) + print(f"\ntolerance = {tolerance}") print() for field in ds_benchmark.field_list: dr = ad_restart[field].squeeze().v @@ -56,6 +62,17 @@ def check_restart(filename, tolerance=1e-12): error = np.amax(np.abs(dr - db)) if np.amax(np.abs(db)) != 0.0: error /= np.amax(np.abs(db)) - print("field: {}; error = {:g}".format(field, error)) + print(f"field: {field}; error = {error}") assert error < tolerance print() + + +filename = sys.argv[1] + +# compare restart results against original results +check_restart(filename) + +# compare restart checksums against original checksums +testname = os.path.split(os.getcwd())[1] +testname = testname.replace("_restart", "") +checksumAPI.evaluate_checksum(testname, filename, rtol=1e-12) From 21aae4ef06192f895a24a0380958f616e5252962 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 28 Aug 2024 10:44:03 -0700 Subject: [PATCH 146/167] Revert LASY debugging --- .azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 01a91ba8407..daa3b01763b 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -154,9 +154,7 @@ jobs: # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) - # FIXME debug - ctest --test-dir build --output-on-failure -E AMReX -R lasy --verbose - #ctest --test-dir build --output-on-failure -E AMReX + ctest --test-dir build --output-on-failure -E AMReX rm -rf build #rm -rf ${WARPX_CI_TMP} df -h From 10fa3994f3e251d1a0e8d82e48b1a246e932b3b5 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 29 Aug 2024 08:34:24 -0700 Subject: [PATCH 147/167] Debugging LASY tests --- .azure-pipelines.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index daa3b01763b..a9170620383 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: #OMP_NUM_THREADS: 1 WARPX_CI_CCACHE: 'TRUE' #WARPX_CI_NUM_MAKE_JOBS: 2 - #WARPX_CI_OPENPMD: 'TRUE' + WARPX_CI_OPENPMD: 'TRUE' #WARPX_CI_TMP: '/tmp/ci' strategy: @@ -98,14 +98,14 @@ jobs: export PATH="$HOME/.local/bin:$PATH" sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.com/ax3l/cmake-easyinstall/main/cmake-easyinstall sudo chmod a+x /usr/local/bin/cmake-easyinstall - #if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then - # cmake-easyinstall --prefix=/usr/local \ - # git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ - # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - # -DCMAKE_VERBOSE_MAKEFILE=ON \ - # -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF - # python3 -m pip install --upgrade openpmd-api - #fi + if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then + cmake-easyinstall --prefix=/usr/local \ + git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ + -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF + #python3 -m pip install --upgrade openpmd-api + fi if [ "${WARPX_RZ_FFT:-FALSE}" == "TRUE" ]; then # BLAS++ cmake-easyinstall --prefix=/usr/local \ @@ -154,7 +154,8 @@ jobs: # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) - ctest --test-dir build --output-on-failure -E AMReX + #ctest --test-dir build --output-on-failure -E AMReX + ctest --test-dir build --output-on-failure -R lasy --verbose rm -rf build #rm -rf ${WARPX_CI_TMP} df -h From e948f41920f9fda31d239cc0224d6332e4eccf55 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 29 Aug 2024 15:21:28 -0700 Subject: [PATCH 148/167] CMake: Dependency Must Exist (run) Do not create a test that has an unfulfilled dependency. This can happen if the dependency has stricter compile-time requirements (e.g., needs Python) than the dependent (e.g., pure inputs file). --- Examples/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3677ceba255..16bba2ef772 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -58,6 +58,11 @@ function(add_warpx_test return() endif() + # cannot run tests with unfulfilled dependencies + if(dependency AND NOT TEST ${dependency}.run) + return() + endif() + # set dimension suffix warpx_set_suffix_dims(SD ${dims}) From 065e2b93d047e57d428d1fd255c5f71de58575b4 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 29 Aug 2024 15:22:34 -0700 Subject: [PATCH 149/167] LASY Scripts: Recent 0.5.0 Changes Adopt inputs for breaking changes from 0.5.0 LASY update. --- .../inputs_test_1d_laser_injection_from_lasy_file | 2 +- .../inputs_test_1d_laser_injection_from_lasy_file_boost | 2 +- .../inputs_test_2d_laser_injection_from_lasy_file | 2 +- .../inputs_test_3d_laser_injection_from_lasy_file | 2 +- .../inputs_test_rz_laser_injection_from_RZ_lasy_file | 2 +- .../inputs_test_rz_laser_injection_from_lasy_file | 2 +- Regression/requirements.txt | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file index 78acdba0756..1510a8df4c3 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" +lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_prepare/diags/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost index f9bea5390be..d118ce85ae5 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost +++ b/Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost @@ -47,7 +47,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_boost_prepare/gaussian_laser_3d_00000.h5" +lasy_laser.lasy_file_name = "../test_1d_laser_injection_from_lasy_file_boost_prepare/diags/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file index 45994df7d7b..f6a0693a5bd 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "../test_2d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" +lasy_laser.lasy_file_name = "../test_2d_laser_injection_from_lasy_file_prepare/diags/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file index c3613fda1ea..534ea729886 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file @@ -40,7 +40,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "../test_3d_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" +lasy_laser.lasy_file_name = "../test_3d_laser_injection_from_lasy_file_prepare/diags/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file index 5ec9b55b345..a4c87d244fc 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file @@ -40,7 +40,7 @@ lasy_RZ_laser.e_max = 1.e14 # Maximum amplitude of the laser field lasy_RZ_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_RZ_laser.profile = from_file lasy_RZ_laser.time_chunk_size = 50 -lasy_RZ_laser.lasy_file_name = "../test_rz_laser_injection_from_RZ_lasy_file_prepare/laguerre_laser_RZ_00000.h5" +lasy_RZ_laser.lasy_file_name = "../test_rz_laser_injection_from_RZ_lasy_file_prepare/diags/laguerre_laser_RZ_00000.h5" lasy_RZ_laser.delay = 0.0 # Diagnostics diff --git a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file index b86fc8a98de..cc7100afb9d 100644 --- a/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file +++ b/Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file @@ -41,7 +41,7 @@ lasy_laser.e_max = 1.e14 # Maximum amplitude of the laser field (i lasy_laser.wavelength = 1.0e-6 # The wavelength of the laser (in meters) lasy_laser.profile = from_file lasy_laser.time_chunk_size = 50 -lasy_laser.lasy_file_name = "../test_rz_laser_injection_from_lasy_file_prepare/gaussian_laser_3d_00000.h5" +lasy_laser.lasy_file_name = "../test_rz_laser_injection_from_lasy_file_prepare/diags/gaussian_laser_3d_00000.h5" lasy_laser.delay = 0.0 # Diagnostics diff --git a/Regression/requirements.txt b/Regression/requirements.txt index b0b8ef40106..509123899ba 100644 --- a/Regression/requirements.txt +++ b/Regression/requirements.txt @@ -1,5 +1,6 @@ +-r ../requirements.txt dill -lasy +lasy>=0.5.0 matplotlib mpi4py numpy @@ -7,6 +8,5 @@ openpmd-api openpmd-viewer pandas periodictable -picmistandard scipy yt From f7d35a43eb176388090cf986dc9d649de0846160 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 29 Aug 2024 17:23:44 -0700 Subject: [PATCH 150/167] Restore all tests --- .azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a9170620383..02fbb67449d 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -154,8 +154,7 @@ jobs: # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) - #ctest --test-dir build --output-on-failure -E AMReX - ctest --test-dir build --output-on-failure -R lasy --verbose + ctest --test-dir build --output-on-failure -E AMReX rm -rf build #rm -rf ${WARPX_CI_TMP} df -h From 4a99a6a46d085258dbd4578a6f2835ba1cf9f469 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 29 Aug 2024 18:06:25 -0700 Subject: [PATCH 151/167] Less dependencies in Azure pipeline --- .azure-pipelines.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 02fbb67449d..048723c2f35 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: #OMP_NUM_THREADS: 1 WARPX_CI_CCACHE: 'TRUE' #WARPX_CI_NUM_MAKE_JOBS: 2 - WARPX_CI_OPENPMD: 'TRUE' + #WARPX_CI_OPENPMD: 'TRUE' #WARPX_CI_TMP: '/tmp/ci' strategy: @@ -98,14 +98,14 @@ jobs: export PATH="$HOME/.local/bin:$PATH" sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.com/ax3l/cmake-easyinstall/main/cmake-easyinstall sudo chmod a+x /usr/local/bin/cmake-easyinstall - if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then - cmake-easyinstall --prefix=/usr/local \ - git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF - #python3 -m pip install --upgrade openpmd-api - fi + #if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then + # cmake-easyinstall --prefix=/usr/local \ + # git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ + # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + # -DCMAKE_VERBOSE_MAKEFILE=ON \ + # -DopenPMD_USE_PYTHON=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI_TOOLS=OFF + # #python3 -m pip install --upgrade openpmd-api + #fi if [ "${WARPX_RZ_FFT:-FALSE}" == "TRUE" ]; then # BLAS++ cmake-easyinstall --prefix=/usr/local \ @@ -120,17 +120,17 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi - if [[ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]]; then - cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \ - -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \ - -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF \ - -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF \ - -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \ - -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \ - -DHeffte_ENABLE_MAGMA=OFF \ - -DCMAKE_VERBOSE_MAKEFILE=ON - fi + #if [[ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]]; then + # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \ + # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + # -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \ + # -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF \ + # -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF \ + # -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \ + # -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \ + # -DHeffte_ENABLE_MAGMA=OFF \ + # -DCMAKE_VERBOSE_MAKEFILE=ON + #fi # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt python3 -m pip cache purge From 5c75f810095a23e273afeacc6b8048fc557b4ef3 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 09:50:27 -0700 Subject: [PATCH 152/167] Add missing tests --- Examples/Tests/CMakeLists.txt | 1 + .../Tests/particle_data_python/CMakeLists.txt | 21 ++++++----- .../projection_divb_cleaner/CMakeLists.txt | 35 +++++++++++++++++++ .../{analysis_rz.py => analysis.py} | 0 ...projection_divb_cleaner_callback_picmi.py} | 4 +-- ..._test_3d_projection_divb_cleaner_picmi.py} | 4 +-- ...=> inputs_test_rz_projection_divb_cleaner} | 1 - ...ojection_divb_cleaner_callback_picmi.json} | 0 ...est_3d_projection_divb_cleaner_picmi.json} | 0 ...n => test_rz_projection_divb_cleaner.json} | 0 10 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 Examples/Tests/projection_divb_cleaner/CMakeLists.txt rename Examples/Tests/projection_divb_cleaner/{analysis_rz.py => analysis.py} (100%) rename Examples/Tests/projection_divb_cleaner/{PICMI_inputs_3D_pyload.py => inputs_test_3d_projection_divb_cleaner_callback_picmi.py} (98%) rename Examples/Tests/projection_divb_cleaner/{PICMI_inputs_3d.py => inputs_test_3d_projection_divb_cleaner_picmi.py} (95%) rename Examples/Tests/projection_divb_cleaner/{inputs_rz => inputs_test_rz_projection_divb_cleaner} (96%) rename Regression/Checksum/benchmarks_json/{Python_projection_divb_cleaner_callback_3d.json => test_3d_projection_divb_cleaner_callback_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{Python_projection_divb_cleaner_3d.json => test_3d_projection_divb_cleaner_picmi.json} (100%) rename Regression/Checksum/benchmarks_json/{projection_divb_cleaner_rz.json => test_rz_projection_divb_cleaner.json} (100%) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 3ec88e05449..60cd61aec9a 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -59,6 +59,7 @@ add_subdirectory(photon_pusher) add_subdirectory(plasma_lens) add_subdirectory(pml) add_subdirectory(point_of_contact_eb) +add_subdirectory(projection_divb_cleaner) add_subdirectory(python_wrappers) add_subdirectory(qed) add_subdirectory(radiation_reaction) diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index 9df17f5f568..1ab54d8bbf5 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -23,14 +23,13 @@ add_warpx_test( OFF # dependency ) -# FIXME -#add_warpx_test( -# test_2d_particle_attr_access_unique_picmi # name -# 2 # dims -# 2 # nprocs -# OFF # eb -# Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs -# Examples/Tests/particle_data_python/analysis.py # analysis -# diags/diag1000010 # output -# OFF # dependency -#) +add_warpx_test( + test_2d_particle_attr_access_unique_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py --unique" # inputs + Examples/Tests/particle_data_python/analysis.py # analysis + diags/diag1000010 # output + OFF # dependency +) diff --git a/Examples/Tests/projection_divb_cleaner/CMakeLists.txt b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt new file mode 100644 index 00000000000..edae6c72d8d --- /dev/null +++ b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt @@ -0,0 +1,35 @@ +# Add tests (alphabetical order) ############################################## +# + +add_warpx_test( + test_3d_projection_divb_cleaner_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency +) + +add_warpx_test( + test_3d_projection_divb_cleaner_callback_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_callback_picmi.py # inputs + Examples/analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency +) + +add_warpx_test( + test_rz_projection_divb_cleaner # name + RZ # dims + 1 # nprocs + OFF # eb + Examples/Tests/projection_divb_cleaner/inputs_test_rz_projection_divb_cleaner # inputs + Examples/Tests/projection_divb_cleaner/analysis.py # analysis + diags/diag1000001 # output + OFF # dependency +) diff --git a/Examples/Tests/projection_divb_cleaner/analysis_rz.py b/Examples/Tests/projection_divb_cleaner/analysis.py similarity index 100% rename from Examples/Tests/projection_divb_cleaner/analysis_rz.py rename to Examples/Tests/projection_divb_cleaner/analysis.py diff --git a/Examples/Tests/projection_divb_cleaner/PICMI_inputs_3D_pyload.py b/Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_callback_picmi.py similarity index 98% rename from Examples/Tests/projection_divb_cleaner/PICMI_inputs_3D_pyload.py rename to Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_callback_picmi.py index 2e8474af01d..e6eb7ecf904 100644 --- a/Examples/Tests/projection_divb_cleaner/PICMI_inputs_3D_pyload.py +++ b/Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_callback_picmi.py @@ -178,12 +178,10 @@ def __init__(self): ####################################################################### field_diag = picmi.FieldDiagnostic( - name="field_diag", + name="diag1", grid=self.grid, period=self.diag_steps, data_list=["B"], - write_dir=".", - warpx_file_prefix="Python_projection_divb_cleaner_callback_3d_plt", warpx_format="plotfile", ) simulation.add_diagnostic(field_diag) diff --git a/Examples/Tests/projection_divb_cleaner/PICMI_inputs_3d.py b/Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_picmi.py similarity index 95% rename from Examples/Tests/projection_divb_cleaner/PICMI_inputs_3d.py rename to Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_picmi.py index 8769a74dde3..f4347f30e56 100644 --- a/Examples/Tests/projection_divb_cleaner/PICMI_inputs_3d.py +++ b/Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_picmi.py @@ -69,8 +69,6 @@ grid=grid, period=1, data_list=["Bx", "By", "Bz"], - write_dir=".", - warpx_file_prefix="Python_projection_divb_cleaner_3d_plt", warpx_plot_raw_fields=True, warpx_plot_raw_fields_guards=True, ) @@ -107,7 +105,7 @@ ##### SIMULATION ANALYSIS ###### ################################# -filename = "Python_projection_divb_cleaner_3d_plt000001" +filename = "diags/diag1000001" ds = yt.load(filename) grid0 = ds.index.grids[0] diff --git a/Examples/Tests/projection_divb_cleaner/inputs_rz b/Examples/Tests/projection_divb_cleaner/inputs_test_rz_projection_divb_cleaner similarity index 96% rename from Examples/Tests/projection_divb_cleaner/inputs_rz rename to Examples/Tests/projection_divb_cleaner/inputs_test_rz_projection_divb_cleaner index 86e12cd39d1..3e8f69ee411 100644 --- a/Examples/Tests/projection_divb_cleaner/inputs_rz +++ b/Examples/Tests/projection_divb_cleaner/inputs_test_rz_projection_divb_cleaner @@ -45,7 +45,6 @@ diagnostics.diags_names = diag1 diag1.intervals = 1 diag1.diag_type = Full diag1.fields_to_plot = Br Bt Bz -diag1.file_prefix= projection_divb_cleaner_rz_plt diag1.plot_raw_fields = true diag1.plot_raw_fields_guards = true diag1.format = plotfile diff --git a/Regression/Checksum/benchmarks_json/Python_projection_divb_cleaner_callback_3d.json b/Regression/Checksum/benchmarks_json/test_3d_projection_divb_cleaner_callback_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_projection_divb_cleaner_callback_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_projection_divb_cleaner_callback_picmi.json diff --git a/Regression/Checksum/benchmarks_json/Python_projection_divb_cleaner_3d.json b/Regression/Checksum/benchmarks_json/test_3d_projection_divb_cleaner_picmi.json similarity index 100% rename from Regression/Checksum/benchmarks_json/Python_projection_divb_cleaner_3d.json rename to Regression/Checksum/benchmarks_json/test_3d_projection_divb_cleaner_picmi.json diff --git a/Regression/Checksum/benchmarks_json/projection_divb_cleaner_rz.json b/Regression/Checksum/benchmarks_json/test_rz_projection_divb_cleaner.json similarity index 100% rename from Regression/Checksum/benchmarks_json/projection_divb_cleaner_rz.json rename to Regression/Checksum/benchmarks_json/test_rz_projection_divb_cleaner.json From d36e9e0d8018f8e524b98b3abf2e696f3616a8d9 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 11:47:05 -0700 Subject: [PATCH 153/167] Quotation marks around restart file paths --- .../uniform_plasma/inputs_test_3d_uniform_plasma_restart | 2 +- .../inputs_test_rz_load_external_field_grid_restart | 2 +- .../inputs_test_rz_load_external_field_particles_restart | 2 +- Examples/Tests/particle_fields_diags/CMakeLists.txt | 2 +- Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart | 2 +- Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart | 2 +- Examples/Tests/restart/CMakeLists.txt | 2 +- .../Tests/restart/inputs_test_3d_acceleration_psatd_restart | 2 +- .../restart/inputs_test_3d_acceleration_psatd_time_avg_restart | 2 +- Examples/Tests/restart/inputs_test_3d_acceleration_restart | 2 +- Examples/Tests/restart_eb/CMakeLists.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart index 54df9c1e022..4711ece3843 100644 --- a/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart +++ b/Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart @@ -2,4 +2,4 @@ FILE = inputs_test_3d_uniform_plasma # test input parameters -amr.restart = ../test_3d_uniform_plasma/diags/chk000006 +amr.restart = "../test_3d_uniform_plasma/diags/chk000006" diff --git a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart index 72c668141b7..ed31e697e25 100644 --- a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart +++ b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart @@ -2,4 +2,4 @@ FILE = inputs_test_rz_load_external_field_grid # test input parameters -amr.restart = ../test_rz_load_external_field_grid/diags/chk000150 +amr.restart = "../test_rz_load_external_field_grid/diags/chk000150" diff --git a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart index 3c2cc51d53f..7e20f87d6d2 100644 --- a/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart +++ b/Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart @@ -2,4 +2,4 @@ FILE = inputs_test_rz_load_external_field_particles # test input parameters -amr.restart = ../test_rz_load_external_field_particles/diags/chk000150 +amr.restart = "../test_rz_load_external_field_particles/diags/chk000150" diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 41650ef4e73..91209291c0c 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -18,7 +18,7 @@ add_warpx_test( # 3 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags_single_precision # inputs +# Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs # Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis # diags/diag1000200 # output # OFF # dependency diff --git a/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart index 4e0f283ca37..44b9be4494a 100644 --- a/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart @@ -2,4 +2,4 @@ FILE = inputs_test_2d_pml_x_psatd # test input parameters -amr.restart = ../test_2d_pml_x_psatd/diags/chk000150 +amr.restart = "../test_2d_pml_x_psatd/diags/chk000150" diff --git a/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart b/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart index 12579ada053..b626e3aa662 100644 --- a/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart +++ b/Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart @@ -2,4 +2,4 @@ FILE = inputs_test_2d_pml_x_yee # test input parameters -amr.restart = ../test_2d_pml_x_yee/diags/chk000150 +amr.restart = "../test_2d_pml_x_yee/diags/chk000150" diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 25ea66312bd..6488900655b 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -34,7 +34,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - "Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py amr.restart=../test_2d_runtime_components_picmi/diags/chk000005" # inputs + "Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py amr.restart='../test_2d_runtime_components_picmi/diags/chk000005'" # inputs OFF #Examples/analysis_default_restart.py # analysis OFF #diags/diag1000010 # output test_2d_runtime_components_picmi # dependency diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart index 8410cce04d1..ac2a354dcb9 100644 --- a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart @@ -2,4 +2,4 @@ FILE = inputs_test_3d_acceleration_psatd # test input parameters -amr.restart = ../test_3d_acceleration_psatd/diags/chk000005 +amr.restart = "../test_3d_acceleration_psatd/diags/chk000005" diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart index e906d945439..44956c2259b 100644 --- a/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart @@ -2,4 +2,4 @@ FILE = inputs_test_3d_acceleration_psatd_time_avg # test input parameters -amr.restart = ../test_3d_acceleration_psatd_time_avg/diags/chk000005 +amr.restart = "../test_3d_acceleration_psatd_time_avg/diags/chk000005" diff --git a/Examples/Tests/restart/inputs_test_3d_acceleration_restart b/Examples/Tests/restart/inputs_test_3d_acceleration_restart index b475d95be49..320224f6c16 100644 --- a/Examples/Tests/restart/inputs_test_3d_acceleration_restart +++ b/Examples/Tests/restart/inputs_test_3d_acceleration_restart @@ -2,4 +2,4 @@ FILE = inputs_test_3d_acceleration # test input parameters -amr.restart = ../test_3d_acceleration/diags/chk000005 +amr.restart = "../test_3d_acceleration/diags/chk000005" diff --git a/Examples/Tests/restart_eb/CMakeLists.txt b/Examples/Tests/restart_eb/CMakeLists.txt index d211c2114f7..37b75d05d46 100644 --- a/Examples/Tests/restart_eb/CMakeLists.txt +++ b/Examples/Tests/restart_eb/CMakeLists.txt @@ -18,7 +18,7 @@ add_warpx_test( # 3 # dims # 1 # nprocs # ON # eb -# "Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py amr.restart=../test_3d_eb_picmi/diags/chk000030" # inputs +# "Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py amr.restart='../test_3d_eb_picmi/diags/chk000030'" # inputs # Examples/analysis_default_restart.py # analysis # diags/diag1000060 # output # test_3d_eb_picmi # dependency From f89bb58bc533aad904f054b9ee17aa627474a44b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 11:49:09 -0700 Subject: [PATCH 154/167] Cleanup --- .azure-pipelines.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 048723c2f35..67859220161 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -17,11 +17,8 @@ jobs: CMAKE_GENERATOR: 'Ninja' FFTW_HOME: '/usr' LAPACKPP_HOME: '/usr/local' - #OMP_NUM_THREADS: 1 WARPX_CI_CCACHE: 'TRUE' - #WARPX_CI_NUM_MAKE_JOBS: 2 #WARPX_CI_OPENPMD: 'TRUE' - #WARPX_CI_TMP: '/tmp/ci' strategy: # FIXME uncomment all variants @@ -44,7 +41,7 @@ jobs: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_EB=ON WARPX_RZ_FFT: 'TRUE' #single_precision: - # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PRECISION=SINGLE + # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_PRECISION=SINGLE # WARPX_RZ_FFT: 'TRUE' # default: 60; maximum: 360 @@ -145,7 +142,6 @@ jobs: displayName: 'Install dependencies' - bash: | - # FIXME remove unused variables/commands set -eu -o pipefail df -h # configure @@ -156,6 +152,5 @@ jobs: # run tests (exclude pytest.AMReX when running Python tests) ctest --test-dir build --output-on-failure -E AMReX rm -rf build - #rm -rf ${WARPX_CI_TMP} df -h displayName: 'Build & test' From 7f4dcc38ac78ccc15097025ff3f080d06b3cc83c Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 13:49:57 -0700 Subject: [PATCH 155/167] Rename `WarpX_CI` flag --- .azure-pipelines.yml | 2 +- CMakeLists.txt | 6 +++--- Examples/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 67859220161..bb747728f84 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -146,7 +146,7 @@ jobs: df -h # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" - cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} -DWarpX_CI=ON + cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} -DWarpX_TEST_CLEANUP=ON # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) diff --git a/CMakeLists.txt b/CMakeLists.txt index 526ed2e38a3..905c93494a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,9 +89,9 @@ option(WarpX_QED_TABLE_GEN "QED table generation (requires PICSAR and Boost)" option(WarpX_QED_TOOLS "Build external tool to generate QED lookup tables (requires PICSAR and Boost)" OFF) -# Advanced option to flag automated CI runs -option(WarpX_CI "This is a CI run" OFF) -mark_as_advanced(WarpX_CI) +# Advanced option to automatically clean up CI test directories +option(WarpX_TEST_CLEANUP "Clean up CI test directories" OFF) +mark_as_advanced(WarpX_TEST_CLEANUP) set(WarpX_DIMS_VALUES 1 2 3 RZ) set(WarpX_DIMS 3 CACHE STRING "Simulation dimensionality <1;2;3;RZ>") diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 16bba2ef772..75494a6e97e 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -192,7 +192,7 @@ function(add_warpx_test endif() # CI: remove test directory after run - if(WarpX_CI) + if(WarpX_TEST_CLEANUP) add_test( NAME ${name}.cleanup COMMAND ${CMAKE_COMMAND} -E rm -rf ${THIS_WORKING_DIR} @@ -212,7 +212,7 @@ function(add_warpx_test if(analysis) set_property(TEST ${name}.run APPEND PROPERTY DEPENDS "${dependency}.analysis") endif() - if(WarpX_CI) + if(WarpX_TEST_CLEANUP) # do not clean up dependency test before current test is completed set_property(TEST ${dependency}.cleanup APPEND PROPERTY DEPENDS "${name}.cleanup") endif() From 0a3cd9a4c3d8ab9810971a0c1dd668383c04889c Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 15:05:15 -0700 Subject: [PATCH 156/167] Restore heFFTe dependency in Azure pipeline --- .azure-pipelines.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index bb747728f84..337974119b0 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -18,10 +18,9 @@ jobs: FFTW_HOME: '/usr' LAPACKPP_HOME: '/usr/local' WARPX_CI_CCACHE: 'TRUE' - #WARPX_CI_OPENPMD: 'TRUE' + #WARPX_OPENPMD: 'TRUE' strategy: - # FIXME uncomment all variants matrix: # Cartesian 1D cartesian_1d: @@ -32,6 +31,7 @@ jobs: # Cartesian 3D cartesian_3d: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=3 -DWarpX_FFT=ON -DWarpX_PYTHON=ON + WARPX_HEFFTE: 'TRUE' # Cylindrical RZ cylindrical_rz: WARPX_CMAKE_FLAGS: -DWarpX_DIMS=RZ -DWarpX_FFT=ON -DWarpX_PYTHON=ON @@ -40,6 +40,7 @@ jobs: embedded_boundaries: WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_EB=ON WARPX_RZ_FFT: 'TRUE' + # single precision #single_precision: # WARPX_CMAKE_FLAGS: -DWarpX_DIMS='1;2;3;RZ' -DWarpX_FFT=ON -DWarpX_PYTHON=ON -DWarpX_PRECISION=SINGLE # WARPX_RZ_FFT: 'TRUE' @@ -95,7 +96,7 @@ jobs: export PATH="$HOME/.local/bin:$PATH" sudo curl -L -o /usr/local/bin/cmake-easyinstall https://raw.githubusercontent.com/ax3l/cmake-easyinstall/main/cmake-easyinstall sudo chmod a+x /usr/local/bin/cmake-easyinstall - #if [ "${WARPX_CI_OPENPMD:-FALSE}" == "TRUE" ]; then + #if [ "${WARPX_OPENPMD:-FALSE}" == "TRUE" ]; then # cmake-easyinstall --prefix=/usr/local \ # git+https://github.com/openPMD/openPMD-api.git@0.14.3 \ # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ @@ -117,24 +118,24 @@ jobs: -DCMAKE_CXX_STANDARD=17 \ -Duse_cmake_find_lapack=ON -Dbuild_tests=OFF -DCMAKE_VERBOSE_MAKEFILE=ON fi - #if [[ "${WARPX_CI_REGULAR_CARTESIAN_3D:-FALSE}" == "TRUE" ]]; then - # cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \ - # -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ - # -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \ - # -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF \ - # -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF \ - # -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \ - # -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \ - # -DHeffte_ENABLE_MAGMA=OFF \ - # -DCMAKE_VERBOSE_MAKEFILE=ON - #fi + if [ "${WARPX_HEFFTE:-FALSE}" == "TRUE" ]; then + cmake-easyinstall --prefix=/usr/local git+https://github.com/icl-utk-edu/heffte.git@v2.4.0 \ + -DCMAKE_CXX_COMPILER_LAUNCHER=$(which ccache) \ + -DCMAKE_CXX_STANDARD=17 -DHeffte_ENABLE_DOXYGEN=OFF \ + -DHeffte_ENABLE_FFTW=ON -DHeffte_ENABLE_TESTING=OFF \ + -DHeffte_ENABLE_CUDA=OFF -DHeffte_ENABLE_ROCM=OFF \ + -DHeffte_ENABLE_ONEAPI=OFF -DHeffte_ENABLE_MKL=OFF \ + -DHeffte_ENABLE_PYTHON=OFF -DHeffte_ENABLE_FORTRAN=OFF \ + -DHeffte_ENABLE_MAGMA=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON + fi # Python modules required for test analysis python3 -m pip install --upgrade -r Regression/requirements.txt python3 -m pip cache purge # external repositories required for test analysis cd .. git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git - # FIXME do we want to select only specific datasets? + # TODO select only specific datasets? git clone --depth 1 https://github.com/openPMD/openPMD-example-datasets.git cd - rm -rf ${CEI_TMP} From d4d58eb46912cae7312895f24b6607dfb9c3e3be Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Fri, 30 Aug 2024 15:35:10 -0700 Subject: [PATCH 157/167] Add CMake flag `WarpX_TEST_FPETRAP` --- .azure-pipelines.yml | 6 +++++- CMakeLists.txt | 4 ++++ Examples/CMakeLists.txt | 21 ++++++++++++++------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 337974119b0..1f963097f37 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -147,7 +147,11 @@ jobs: df -h # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" - cmake -S . -B build ${AMReX_CMAKE_FLAGS} ${WARPX_CMAKE_FLAGS} -DWarpX_TEST_CLEANUP=ON + cmake -S . -B build \ + ${AMReX_CMAKE_FLAGS} \ + ${WARPX_CMAKE_FLAGS} \ + -DWarpX_TEST_CLEANUP=ON \ + -DWarpX_TEST_FPETRAP=ON # build cmake --build build -j 2 # run tests (exclude pytest.AMReX when running Python tests) diff --git a/CMakeLists.txt b/CMakeLists.txt index 905c93494a4..8d5cc60b46f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,6 +93,10 @@ option(WarpX_QED_TOOLS "Build external tool to generate QED lookup tables (r option(WarpX_TEST_CLEANUP "Clean up CI test directories" OFF) mark_as_advanced(WarpX_TEST_CLEANUP) +# Advanced option to run CI tests with FPE-trapping runtime parameters +option(WarpX_TEST_FPETRAP "Run CI tests with FPE-trapping runtime parameters" OFF) +mark_as_advanced(WarpX_TEST_FPETRAP) + set(WarpX_DIMS_VALUES 1 2 3 RZ) set(WarpX_DIMS 3 CACHE STRING "Simulation dimensionality <1;2;3;RZ>") list(REMOVE_DUPLICATES WarpX_DIMS) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 75494a6e97e..4e366febc06 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -117,7 +117,7 @@ function(add_warpx_test ) # set Python executable - set(THIS_Python_EXE) + set(THIS_Python_EXE) # FIXME unsetting a variable can expose a cache variable that was previously hidden if(python) set(THIS_Python_EXE ${Python_EXECUTABLE}) endif() @@ -138,18 +138,24 @@ function(add_warpx_test # FIXME Use helper function to handle Windows exceptions set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") else() + # TODO Use these for Python tests too set(runtime_params "amrex.abort_on_unused_inputs = 1" - "amrex.fpe_trap_invalid = 1" - "amrex.fpe_trap_overflow = 1" - "amrex.fpe_trap_zero = 1" "amrex.throw_exception = 1" "warpx.always_warn_immediately = 1" - # FIXME should come before input file - #"warpx.abort_on_warning_threshold = low" "warpx.do_dynamic_scheduling = 0" "warpx.serialize_initial_conditions = 1" + # FIXME should go before input file + #"warpx.abort_on_warning_threshold = low" ) + set(runtime_params_fpetrap "") + if(WarpX_TEST_FPETRAP) + set(runtime_params_fpetrap + "amrex.fpe_trap_invalid = 1" + "amrex.fpe_trap_overflow = 1" + "amrex.fpe_trap_zero = 1" + ) + endif() add_test( NAME ${name}.run COMMAND @@ -157,6 +163,7 @@ function(add_warpx_test $ ${INPUTS_FILE} ${runtime_params} + ${runtime_params_fpetrap} ${INPUTS_ARGS} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) @@ -165,7 +172,7 @@ function(add_warpx_test # run all tests with 1 OpenMP thread by default set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") - set(THIS_Python_SCRIPT_EXE) + set(THIS_Python_SCRIPT_EXE) # FIXME unsetting a variable can expose a cache variable that was previously hidden if(python OR WIN32) set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) endif() From ba017dc63f1d6db13a056d257ef0fa04839179a8 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 2 Sep 2024 17:50:42 -0700 Subject: [PATCH 158/167] Address two Fixme Comments --- Examples/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 4e366febc06..dc7331a2d7f 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -117,9 +117,10 @@ function(add_warpx_test ) # set Python executable - set(THIS_Python_EXE) # FIXME unsetting a variable can expose a cache variable that was previously hidden if(python) set(THIS_Python_EXE ${Python_EXECUTABLE}) + else() + set(THIS_Python_EXE "") endif() # test run @@ -172,9 +173,10 @@ function(add_warpx_test # run all tests with 1 OpenMP thread by default set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") - set(THIS_Python_SCRIPT_EXE) # FIXME unsetting a variable can expose a cache variable that was previously hidden if(python OR WIN32) set(THIS_Python_SCRIPT_EXE ${Python_EXECUTABLE}) + else() + set(THIS_Python_SCRIPT_EXE "") endif() # test analysis From af246bcea25d783457bd006032bb90ed513e7404 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Tue, 3 Sep 2024 15:45:45 -0700 Subject: [PATCH 159/167] Docs first draft --- Docs/source/developers/testing.rst | 213 +++++++++++++++++------------ 1 file changed, 124 insertions(+), 89 deletions(-) diff --git a/Docs/source/developers/testing.rst b/Docs/source/developers/testing.rst index c6a09d970df..5529ecb2aca 100644 --- a/Docs/source/developers/testing.rst +++ b/Docs/source/developers/testing.rst @@ -3,7 +3,7 @@ Testing the code ================ -When adding a new feature, you want to make sure that (i) you did not break the existing code and (ii) your contribution gives correct results. While existing capabilities are tested regularly remotely (when commits are pushed to an open PR on CI, and every night on local clusters), it can also be useful to run tests on your custom input file. This section details how to use both automated and custom tests. +When adding a new feature, you want to make sure that (i) you did not break the existing code and (ii) your contribution gives correct results. While the code is tested regularly remotely (on the cloud when commits are pushed to an open PR, and every night on local clusters), it can also be useful to run tests on your custom input file. This section details how to use both automated and custom tests. Continuous Integration in WarpX ------------------------------- @@ -11,31 +11,14 @@ Continuous Integration in WarpX Configuration ^^^^^^^^^^^^^ -Our regression tests are using the suite published and documented at `AMReX-Codes/regression_testing `__. +Our regression tests are run with `CTest `__, an executable that comes with CMake. -Most of the configuration of our regression tests happens in ``Regression/Warpx-tests.ini``. -We slightly modify this file in ``Regression/prepare_file_ci.py``. +The test suite is ready to run once you have configured and built WarpX with CMake, following the instructions that you find in our :ref:`Users ` or :ref:`Developers ` sections. -For example, if you like to change the compiler to compilation to build on Nvidia GPUs, modify this block to add ``-DWarpX_COMPUTE=CUDA``: +A test that requires a build option that was not configured and built will be skipped automatically. For example, if you configure and build WarpX in 1D only, any test of dimensionality other than 1D, which would require WarpX to be configured and built in the corresponding dimensionality, will be skipped automatically. -.. code-block:: ini - - [source] - dir = /home/regtester/AMReX_RegTesting/warpx - branch = development - cmakeSetupOpts = -DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON -DWarpX_COMPUTE=CUDA - -We also support changing compilation options via the usual :ref:`build environment variables `. -For instance, compiling with ``clang++ -Werror`` would be: - -.. code-block:: sh - - export CXX=$(which clang++) - export CXXFLAGS="-Werror" - - -Run Pre-Commit Tests Locally ----------------------------- +How to run pre-commit tests locally +----------------------------------- When proposing code changes to Warpx, we perform a couple of automated stylistic and correctness checks on the code change. You can run those locally before you push to save some time, install them once like this: @@ -47,97 +30,149 @@ You can run those locally before you push to save some time, install them once l See `pre-commit.com `__ and our ``.pre-commit-config.yaml`` file in the repository for more details. +How to run automated tests locally +---------------------------------- + +Once your new feature is ready, there are ways to check that you did not break anything. +WarpX has automated tests running every time a commit is pushed to an open pull request. +The input files and scripts used by the automated tests can be found in the `Examples `__ directory, either under `Physics_applications `__ or `Tests `__. + +For easier debugging, it can be convenient to run the tests on your local machine by executing CTest as illustrated in the examples below (where we assume that WarpX was configured and built in the directory ``build``): + +* List tests available for the current build options: + + .. code-block:: sh + + ctest --test-dir build -N + +* Run tests available for the current build options: + + .. code-block:: sh + + ctest --test-dir build + +* Run tests available for the current build options in parallel (while preserving existing dependencies between tests): + + .. code-block:: sh + + ctest --test-dir build -j 2 -Run the test suite locally +* Run tests available for the current build options and output anything outputted by the test program if the test should fail: + + .. code-block:: sh + + ctest --test-dir build --output-on-failure + +* Run tests available for the current build options with verbose output: + + .. code-block:: sh + + ctest --test-dir build --verbose + +* Run tests matching the regular expression ``laser_acceleration``: + + .. code-block:: sh + + ctest --test-dir build -R laser_acceleration + +* Run tests except those matching the regular expression ``laser_acceleration``: + + .. code-block:: sh + + ctest --test-dir build -E laser_acceleration + +Once the execution of CTest is completed, you can find all files associated with each test in its corresponding directory under ``build/bin/``. +For example, if you run the single test ``test_3d_laser_acceleration``, you can find all files associated with this test in the directory ``build/bin/test_3d_laser_acceleration/``. + +If you modify the code base locally and want to assess the effects of your code changes on the automated tests, you need to first rebuild WarpX including your code changes and then rerun CTest. + +How to add automated tests -------------------------- -Once your new feature is ready, there are ways to check that you did not break anything. -WarpX has automated tests running every time a commit is added to an open pull request. -The list of automated tests is defined in `./Regression/WarpX-tests.ini `__. +As mentioned above, the input files and scripts used by the automated tests can be found in the `Examples `__ directory, either under `Physics_applications `__ or `Tests `__. -For easier debugging, it can be convenient to run the tests on your local machine by executing the script -`./run_test.sh `__ from WarpX's root folder, as illustrated in the examples below: +Each test directory must contain a file named ``CMakeLists.txt`` where all tests associated with the input files and scripts in that directory must be listed. -.. code-block:: sh +A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as illustrated in the examples below: - # Example: - # run all tests defined in ./Regression/WarpX-tests.ini - ./run_test.sh +* Add the **regular test** ``test_1d_laser_acceleration``, with input file and analysis script in ``Examples/Tests/laser_acceleration/``: - # Example: - # run only the test named 'pml_x_yee' - ./run_test.sh pml_x_yee + .. code-block:: sh - # Example: - # run only the tests named 'pml_x_yee', 'pml_x_ckc' and 'pml_x_psatd' - ./run_test.sh pml_x_yee pml_x_ckc pml_x_psatd + add_warpx_test( + test_1d_laser_acceleration # name + 1 # dims + 2 # nprocs + OFF # eb + Examples/Tests/laser_acceleration/inputs_test_1d_laser_acceleration # inputs + Examples/Tests/laser_acceleration/analysis.py # analysis + diags/diag1000100 # output (plotfile) + OFF # dependency + ) -Note that the script `./run_test.sh `__ runs the tests with the exact same compile-time options and runtime options used to run the tests remotely. +* Add the **PICMI test** ``test_2d_laser_acceleration_picmi``, with input file and analysis script in ``Examples/Tests/laser_acceleration/``: -Moreover, the script `./run_test.sh `__ compiles all the executables that are necessary in order to run the chosen tests. -The default number of threads allotted for compiling is set with ``numMakeJobs = 8`` in `./Regression/WarpX-tests.ini `__. -However, when running the tests on a local machine, it is usually possible and convenient to allot more threads for compiling, in order to speed up the builds. -This can be accomplished by setting the environment variable ``WARPX_CI_NUM_MAKE_JOBS``, with the preferred number of threads that fits your local machine, e.g. ``export WARPX_CI_NUM_MAKE_JOBS=16`` (or less if your machine is smaller). -On public CI, we overwrite the value to ``WARPX_CI_NUM_MAKE_JOBS=2``, in order to avoid overloading the available remote resources. -Note that this will not change the number of threads used to run each test, but only the number of threads used to compile each executable necessary to run the tests. + .. code-block:: sh -Once the execution of `./run_test.sh `__ is completed, you can find all the relevant files associated with each test in one single directory. -For example, if you run the single test ``pml_x_yee``, as shown above, on 04/30/2021, you can find all relevant files in the directory ``./test_dir/rt-WarpX/WarpX-tests/2021-04-30/pml_x_yee/``. -The content of this directory will look like the following (possibly including backtraces if the test crashed at runtime): + add_warpx_test( + test_2d_laser_acceleration_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + Examples/Tests/laser_acceleration/inputs_test_2d_laser_acceleration_picmi.py # inputs + Examples/Tests/laser_acceleration/analysis.py # analysis + diags/diag1000100 # output (plotfile) + OFF # dependency + ) -.. code-block:: sh +* Add the **restart test** ``test_3d_laser_acceleration_restart``, with input file in ``Examples/Tests/laser_acceleration/`` and default restart analysis script provided by WarpX: + + .. code-block:: sh - $ ls ./test_dir/rt-WarpX/WarpX-tests/2021-04-30/pml_x_yee/ - analysis_pml_yee.py # Python analysis script - inputs_2d # input file - main2d.gnu.TEST.TPROF.MTMPI.OMP.QED.ex # executable - pml_x_yee.analysis.out # Python analysis output - pml_x_yee.err.out # error output - pml_x_yee.make.out # build output - pml_x_yee_plt00000/ # data output (initialization) - pml_x_yee_plt00300/ # data output (last time step) - pml_x_yee.run.out # test output + add_warpx_test( + test_3d_laser_acceleration_restart # name + 3 # dims + 2 # nprocs + OFF # eb + Examples/Tests/laser_acceleration/inputs_test_3d_laser_acceleration_restart # inputs + Examples/analysis_default_restart.py # analysis + diags/diag1000100 # output (plotfile) + test_3d_laser_acceleration # dependency + ) + Note that the restart has an explicit dependency, namely it can run only provided that the original test, from which the restart checkpoint files will be read, runs first. -Add a test to the suite ------------------------ +* A more complex example. Add the **PICMI test** ``test_rz_laser_acceleration_picmi``, with custom command-line arguments ``--test`` and ``dir``, input file and analysis script in ``Examples/Tests/laser_acceleration/``, and openPMD time series output: -There are three steps to follow to add a new automated test (illustrated here for PML boundary conditions): + .. code-block:: sh -* An input file for your test, in folder `Example/Tests/...`. For the PML test, the input file is at ``Examples/Tests/pml/inputs_2d``. You can also re-use an existing input file (even better!) and pass specific parameters at runtime (see below). -* A Python script that reads simulation output and tests correctness versus theory or calibrated results. For the PML test, see ``Examples/Tests/pml/analysis_pml_yee.py``. It typically ends with Python statement ``assert( error<0.01 )``. -* If you need a new Python package dependency for testing, add it in ``Regression/requirements.txt`` -* Add an entry to ``Regression/WarpX-tests.ini``, so that a WarpX simulation runs your test in the continuous integration process, and the Python script is executed to assess the correctness. For the PML test, the entry is + add_warpx_test( + test_rz_laser_acceleration_picmi # name + RZ # dims + 2 # nprocs + OFF # eb + "Examples/Tests/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py --test --dir 1" # inputs + Examples/Tests/laser_acceleration/analysis.py # analysis + diags/diag1/ # output (openPMD time series) + OFF # dependency + ) -.. code-block:: +If you need a new Python package dependency for testing, please add it in `Regression/requirements.txt `__. - [pml_x_yee] - buildDir = . - inputFile = Examples/Tests/pml/inputs2d - runtime_params = warpx.do_dynamic_scheduling=0 algo.maxwell_solver=yee - dim = 2 - addToCompileString = - cmakeSetupOpts = -DWarpX_DIMS=2 - restartTest = 0 - useMPI = 1 - numprocs = 2 - useOMP = 1 - numthreads = 1 - compileTest = 0 - doVis = 0 - analysisRoutine = Examples/Tests/pml/analysis_pml_yee.py +Sometimes, two tests share a large number of input parameters. The shared input parameters can be collected in a "base" input file that can be passed as a runtime parameter in the actual test input files through the parameter ``FILE``. -If you re-use an existing input file, you can add arguments to ``runtime_params``, like ``runtime_params = amr.max_level=1 amr.n_cell=32 512 max_step=100 plasma_e.zmin=-200.e-6``. +Naming conventions for automated tests +-------------------------------------- -.. note:: +Note that we currently obey the following snake\_case naming conventions for test names and test input files (which make automation tasks easier, e.g., parsing visually, parsing through code, sorting alphabetically, filtering tests in CTest via -R, etc.): - If you added ``analysisRoutine = Examples/analysis_default_regression.py``, then run the new test case locally and add the :ref:`checksum ` file for the expected output. +#. **Regular test names** start with the string ``test_1d_``, ``test_2d_``, ``test_3d_`` or ``test_rz_``, followed by a string that is descriptive of the test. For example, ``test_3d_laser_acceleration``. -.. note:: +#. **PICMI test names** start with the string ``test_1d_``, ``test_2d_``, ``test_3d_`` or ``test_rz_``, followed by a string that is descriptive of the test, and end with the string ``_picmi``. For example, ``test_3d_laser_acceleration_picmi``. - We run those tests on our continuous integration services, which at the moment only have 2 virtual CPU cores. - Thus, make sure that the product of ``numprocs`` and ``numthreads`` for a test is ``<=2``. +#. **Restart test names** end with the string ``_restart``. For example, ``test_3d_laser_acceleration_restart``. +#. **Test input files** start with the string ``inputs_`` followed by the test name. For example, ``inputs_test_3d_laser_acceleration`` or ``inputs_test_3d_laser_acceleration_picmi.py`` or ``inputs_test_3d_laser_acceleration_restart``. Useful tool for plotfile comparison: ``fcompare`` ------------------------------------------------- From ffd4d031c42002c30008115d96921116ae3b3da7 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 4 Sep 2024 11:58:03 -0700 Subject: [PATCH 160/167] Use new `AMREX_INPUTS_FILE_PREFIX` env variable --- .azure-pipelines.yml | 1 + Docs/source/developers/testing.rst | 24 +-- Examples/CMakeLists.txt | 58 ++++---- .../beam_beam_collision/CMakeLists.txt | 4 +- .../analysis_default_openpmd_regression.py | 1 + .../capacitive_discharge/CMakeLists.txt | 20 +-- .../analysis_default_regression.py | 1 + .../laser_acceleration/CMakeLists.txt | 56 +++---- .../analysis_default_openpmd_regression.py | 1 + .../analysis_default_regression.py | 1 + .../laser_ion/CMakeLists.txt | 8 +- .../analysis_default_openpmd_regression.py | 1 + .../plasma_acceleration/CMakeLists.txt | 32 ++-- .../analysis_default_regression.py | 1 + .../plasma_mirror/CMakeLists.txt | 4 +- .../analysis_default_regression.py | 1 + .../spacecraft_charging/CMakeLists.txt | 4 +- .../uniform_plasma/CMakeLists.txt | 12 +- .../analysis_default_regression.py | 1 + .../analysis_default_restart.py | 1 + .../Tests/accelerator_lattice/CMakeLists.txt | 12 +- Examples/Tests/boosted_diags/CMakeLists.txt | 4 +- Examples/Tests/boundaries/CMakeLists.txt | 4 +- Examples/Tests/btd_rz/CMakeLists.txt | 4 +- .../collider_relevant_diags/CMakeLists.txt | 4 +- .../Tests/collider_relevant_diags/analysis.py | 2 +- Examples/Tests/collision/CMakeLists.txt | 24 +-- Examples/Tests/diff_lumi_diag/CMakeLists.txt | 4 +- Examples/Tests/divb_cleaning/CMakeLists.txt | 4 +- Examples/Tests/dive_cleaning/CMakeLists.txt | 8 +- .../electrostatic_dirichlet_bc/CMakeLists.txt | 8 +- .../Tests/electrostatic_sphere/CMakeLists.txt | 20 +-- .../electrostatic_sphere_eb/CMakeLists.txt | 20 +-- .../analysis_default_regression.py | 1 + .../embedded_boundary_cube/CMakeLists.txt | 12 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 8 +- Examples/Tests/embedded_circle/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- Examples/Tests/field_probe/CMakeLists.txt | 4 +- Examples/Tests/flux_injection/CMakeLists.txt | 8 +- Examples/Tests/gaussian_beam/CMakeLists.txt | 8 +- .../analysis_default_regression.py | 1 + Examples/Tests/implicit/CMakeLists.txt | 16 +- .../Tests/initial_distribution/CMakeLists.txt | 4 +- .../initial_plasma_profile/CMakeLists.txt | 4 +- Examples/Tests/ion_stopping/CMakeLists.txt | 4 +- Examples/Tests/ionization/CMakeLists.txt | 12 +- Examples/Tests/langmuir/CMakeLists.txt | 140 +++++++++--------- .../langmuir/analysis_default_regression.py | 1 + Examples/Tests/langmuir_fluids/CMakeLists.txt | 16 +- Examples/Tests/larmor/CMakeLists.txt | 4 +- .../larmor/analysis_default_regression.py | 1 + Examples/Tests/laser_injection/CMakeLists.txt | 12 +- .../laser_injection_from_file/CMakeLists.txt | 42 +++--- Examples/Tests/laser_on_fine/CMakeLists.txt | 4 +- .../analysis_default_regression.py | 1 + .../Tests/load_external_field/CMakeLists.txt | 24 +-- .../analysis_default_restart.py | 1 + .../Tests/magnetostatic_eb/CMakeLists.txt | 12 +- .../analysis_default_regression.py | 1 + .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 4 +- .../Tests/nci_fdtd_stability/CMakeLists.txt | 8 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 68 ++++----- .../analysis_default_regression.py | 1 + .../Tests/nodal_electrostatic/CMakeLists.txt | 4 +- Examples/Tests/nuclear_fusion/CMakeLists.txt | 24 +-- .../Tests/ohm_solver_em_modes/CMakeLists.txt | 8 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../open_bc_poisson_solver/CMakeLists.txt | 4 +- .../CMakeLists.txt | 4 +- .../particle_boundary_process/CMakeLists.txt | 8 +- .../particle_boundary_scrape/CMakeLists.txt | 8 +- .../Tests/particle_data_python/CMakeLists.txt | 12 +- .../analysis_default_regression.py | 1 + .../particle_fields_diags/CMakeLists.txt | 8 +- Examples/Tests/particle_pusher/CMakeLists.txt | 4 +- .../particle_thermal_boundary/CMakeLists.txt | 4 +- .../Tests/particles_in_pml/CMakeLists.txt | 16 +- .../pass_mpi_communicator/CMakeLists.txt | 4 +- Examples/Tests/pec/CMakeLists.txt | 12 +- .../Tests/pec/analysis_default_regression.py | 1 + Examples/Tests/photon_pusher/CMakeLists.txt | 4 +- Examples/Tests/plasma_lens/CMakeLists.txt | 20 +-- Examples/Tests/pml/CMakeLists.txt | 32 ++-- .../Tests/pml/analysis_default_regression.py | 1 + .../Tests/pml/analysis_default_restart.py | 1 + .../Tests/point_of_contact_eb/CMakeLists.txt | 8 +- .../projection_divb_cleaner/CMakeLists.txt | 12 +- .../analysis_default_regression.py | 1 + Examples/Tests/python_wrappers/CMakeLists.txt | 4 +- .../analysis_default_regression.py | 1 + Examples/Tests/qed/CMakeLists.txt | 40 ++--- .../Tests/radiation_reaction/CMakeLists.txt | 4 +- Examples/Tests/reduced_diags/CMakeLists.txt | 20 +-- .../CMakeLists.txt | 4 +- .../Tests/repelling_particles/CMakeLists.txt | 4 +- Examples/Tests/resampling/CMakeLists.txt | 12 +- .../resampling/analysis_default_regression.py | 1 + Examples/Tests/restart/CMakeLists.txt | 36 ++--- .../restart/analysis_default_regression.py | 1 + .../Tests/restart/analysis_default_restart.py | 1 + Examples/Tests/restart_eb/CMakeLists.txt | 8 +- .../restart_eb/analysis_default_regression.py | 1 + .../restart_eb/analysis_default_restart.py | 1 + Examples/Tests/rigid_injection/CMakeLists.txt | 8 +- Examples/Tests/scraping/CMakeLists.txt | 8 +- Examples/Tests/silver_mueller/CMakeLists.txt | 16 +- Examples/Tests/single_particle/CMakeLists.txt | 4 +- .../CMakeLists.txt | 8 +- Examples/Tests/subcycling/CMakeLists.txt | 4 +- .../subcycling/analysis_default_regression.py | 1 + Examples/Tests/vay_deposition/CMakeLists.txt | 8 +- 116 files changed, 614 insertions(+), 582 deletions(-) create mode 120000 Examples/Physics_applications/beam_beam_collision/analysis_default_openpmd_regression.py create mode 120000 Examples/Physics_applications/capacitive_discharge/analysis_default_regression.py create mode 120000 Examples/Physics_applications/laser_acceleration/analysis_default_openpmd_regression.py create mode 120000 Examples/Physics_applications/laser_acceleration/analysis_default_regression.py create mode 120000 Examples/Physics_applications/laser_ion/analysis_default_openpmd_regression.py create mode 120000 Examples/Physics_applications/plasma_acceleration/analysis_default_regression.py create mode 120000 Examples/Physics_applications/plasma_mirror/analysis_default_regression.py create mode 120000 Examples/Physics_applications/uniform_plasma/analysis_default_regression.py create mode 120000 Examples/Physics_applications/uniform_plasma/analysis_default_restart.py create mode 120000 Examples/Tests/electrostatic_sphere_eb/analysis_default_regression.py create mode 120000 Examples/Tests/gaussian_beam/analysis_default_regression.py create mode 120000 Examples/Tests/langmuir/analysis_default_regression.py create mode 120000 Examples/Tests/larmor/analysis_default_regression.py create mode 120000 Examples/Tests/laser_on_fine/analysis_default_regression.py create mode 120000 Examples/Tests/load_external_field/analysis_default_restart.py create mode 120000 Examples/Tests/magnetostatic_eb/analysis_default_regression.py create mode 120000 Examples/Tests/nci_psatd_stability/analysis_default_regression.py create mode 120000 Examples/Tests/particle_data_python/analysis_default_regression.py create mode 120000 Examples/Tests/pec/analysis_default_regression.py create mode 120000 Examples/Tests/pml/analysis_default_regression.py create mode 120000 Examples/Tests/pml/analysis_default_restart.py create mode 120000 Examples/Tests/projection_divb_cleaner/analysis_default_regression.py create mode 120000 Examples/Tests/python_wrappers/analysis_default_regression.py create mode 120000 Examples/Tests/resampling/analysis_default_regression.py create mode 120000 Examples/Tests/restart/analysis_default_regression.py create mode 120000 Examples/Tests/restart/analysis_default_restart.py create mode 120000 Examples/Tests/restart_eb/analysis_default_regression.py create mode 120000 Examples/Tests/restart_eb/analysis_default_restart.py create mode 120000 Examples/Tests/subcycling/analysis_default_regression.py diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 1f963097f37..4df23422a5c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -150,6 +150,7 @@ jobs: cmake -S . -B build \ ${AMReX_CMAKE_FLAGS} \ ${WARPX_CMAKE_FLAGS} \ + -DWarpX_amrex_repo=https://github.com/ax3l/amrex.git -DWarpX_amrex_branch=topic-pp-prefix \ # FIXME remove line -DWarpX_TEST_CLEANUP=ON \ -DWarpX_TEST_FPETRAP=ON # build diff --git a/Docs/source/developers/testing.rst b/Docs/source/developers/testing.rst index 5529ecb2aca..ac6bca2c6e2 100644 --- a/Docs/source/developers/testing.rst +++ b/Docs/source/developers/testing.rst @@ -95,7 +95,7 @@ Each test directory must contain a file named ``CMakeLists.txt`` where all tests A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as illustrated in the examples below: -* Add the **regular test** ``test_1d_laser_acceleration``, with input file and analysis script in ``Examples/Tests/laser_acceleration/``: +* Add the **regular test** ``test_1d_laser_acceleration``: .. code-block:: sh @@ -104,13 +104,13 @@ A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as 1 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_acceleration/inputs_test_1d_laser_acceleration # inputs - Examples/Tests/laser_acceleration/analysis.py # analysis + inputs_test_1d_laser_acceleration # inputs + analysis.py # analysis diags/diag1000100 # output (plotfile) OFF # dependency ) -* Add the **PICMI test** ``test_2d_laser_acceleration_picmi``, with input file and analysis script in ``Examples/Tests/laser_acceleration/``: +* Add the **PICMI test** ``test_2d_laser_acceleration_picmi``: .. code-block:: sh @@ -119,13 +119,13 @@ A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as 2 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_acceleration/inputs_test_2d_laser_acceleration_picmi.py # inputs - Examples/Tests/laser_acceleration/analysis.py # analysis + inputs_test_2d_laser_acceleration_picmi.py # inputs + analysis.py # analysis diags/diag1000100 # output (plotfile) OFF # dependency ) -* Add the **restart test** ``test_3d_laser_acceleration_restart``, with input file in ``Examples/Tests/laser_acceleration/`` and default restart analysis script provided by WarpX: +* Add the **restart test** ``test_3d_laser_acceleration_restart``: .. code-block:: sh @@ -134,15 +134,15 @@ A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as 3 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_acceleration/inputs_test_3d_laser_acceleration_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_3d_laser_acceleration_restart # inputs + analysis_default_restart.py # analysis diags/diag1000100 # output (plotfile) test_3d_laser_acceleration # dependency ) Note that the restart has an explicit dependency, namely it can run only provided that the original test, from which the restart checkpoint files will be read, runs first. -* A more complex example. Add the **PICMI test** ``test_rz_laser_acceleration_picmi``, with custom command-line arguments ``--test`` and ``dir``, input file and analysis script in ``Examples/Tests/laser_acceleration/``, and openPMD time series output: +* A more complex example. Add the **PICMI test** ``test_rz_laser_acceleration_picmi``, with custom command-line arguments ``--test`` and ``dir``, and openPMD time series output: .. code-block:: sh @@ -151,8 +151,8 @@ A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as RZ # dims 2 # nprocs OFF # eb - "Examples/Tests/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py --test --dir 1" # inputs - Examples/Tests/laser_acceleration/analysis.py # analysis + "inputs_test_rz_laser_acceleration_picmi.py --test --dir 1" # inputs + analysis.py # analysis diags/diag1/ # output (openPMD time series) OFF # dependency ) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index dc7331a2d7f..f2898b557f4 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -23,7 +23,7 @@ endif() # eb: needs EB support? (temporary until handled as runtime parameter) # inputs: inputs file or PICMI script, WarpX_MPI decides w/ or w/o MPI # analysis: analysis script, always run without MPI -# output: output file (dir) to analyze +# output: output file(s) to analyze # dependency: name of base test that must run first # function(add_warpx_test @@ -70,36 +70,35 @@ function(add_warpx_test file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) set(THIS_WORKING_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}) - get_filename_component(INPUTS_ALL ${WarpX_SOURCE_DIR}/${inputs} REALPATH) - - # separate input file (full path) and optional command-line arguments - separate_arguments(INPUTS_FILE_ARGS UNIX_COMMAND PROGRAM "${INPUTS_ALL}") - - # get input file (full path) - list(GET INPUTS_FILE_ARGS 0 INPUTS_FILE) - - # get optional command-line arguments - list(SUBLIST INPUTS_FILE_ARGS 1 -1 INPUTS_ARGS) - list(JOIN INPUTS_FILE_ARGS " " INPUTS_FILE_ARGS) - - # get input file's directory - get_filename_component(INPUTS_DIR ${INPUTS_FILE} DIRECTORY) - - # copy base input files to run directory - file(GLOB INPUTS_BASE "${INPUTS_DIR}/inputs_base_${SD}*") - file(COPY ${INPUTS_BASE} DESTINATION ${THIS_WORKING_DIR}) - - # copy test input file to run directory - file(COPY ${INPUTS_FILE} DESTINATION ${THIS_WORKING_DIR}) + # get input file/script and optional command-line arguments + separate_arguments(INPUTS_LIST UNIX_COMMAND "${inputs}") + list(GET INPUTS_LIST 0 INPUTS_FILE) + list(LENGTH INPUTS_LIST INPUTS_LIST_LENGTH) + if(INPUTS_LIST_LENGTH GREATER 1) + list(SUBLIST INPUTS_LIST 1 -1 INPUTS_ARGS) + list(JOIN INPUTS_ARGS " " INPUTS_ARGS) + else() + set(INPUTS_ARGS "") + endif() - # for restart tests, copy input file of original test (without "_restart" suffix) - string(REPLACE "_restart" "" INPUTS_FILE_NORESTART ${INPUTS_FILE}) - file(COPY ${INPUTS_FILE_NORESTART} DESTINATION ${THIS_WORKING_DIR}) + # get analysis script and optional command-line arguments + separate_arguments(ANALYSIS_LIST UNIX_COMMAND "${analysis}") + list(GET ANALYSIS_LIST 0 ANALYSIS_FILE) + cmake_path(SET ANALYSIS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${ANALYSIS_FILE}") + # TODO Enable lines below to handle command-line arguments + #list(LENGTH ANALYSIS_LIST ANALYSIS_LIST_LENGTH) + #if(ANALYSIS_LIST_LENGTH GREATER 1) + # list(SUBLIST ANALYSIS_LIST 1 -1 ANALYSIS_ARGS) + # list(JOIN ANALYSIS_ARGS " " ANALYSIS_ARGS) + #else() + # set(ANALYSIS_ARGS "") + #endif() # Python test? set(python OFF) if(${INPUTS_FILE} MATCHES ".*\.py$") set(python ON) + cmake_path(SET INPUTS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${INPUTS_FILE}") endif() # cannot run Python tests w/o Python support @@ -137,7 +136,7 @@ function(add_warpx_test WORKING_DIRECTORY ${THIS_WORKING_DIR} ) # FIXME Use helper function to handle Windows exceptions - set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") else() # TODO Use these for Python tests too set(runtime_params @@ -170,6 +169,9 @@ function(add_warpx_test ) endif() + # AMReX ParmParse prefix: FILE = + set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "AMREX_INPUTS_FILE_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/") + # run all tests with 1 OpenMP thread by default set_property(TEST ${name}.run APPEND PROPERTY ENVIRONMENT "OMP_NUM_THREADS=1") @@ -184,14 +186,14 @@ function(add_warpx_test add_test( NAME ${name}.analysis COMMAND - ${THIS_Python_SCRIPT_EXE} ${WarpX_SOURCE_DIR}/${analysis} + ${THIS_Python_SCRIPT_EXE} ${ANALYSIS_FILE} ${output} WORKING_DIRECTORY ${THIS_WORKING_DIR} ) # test analysis depends on test run set_property(TEST ${name}.analysis APPEND PROPERTY DEPENDS "${name}.run") # FIXME Use helper function to handle Windows exceptions - set(PYTHONPATH "${PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") + set(PYTHONPATH "$ENV{PYTHONPATH}:${CMAKE_PYTHON_OUTPUT_DIRECTORY}") # add paths for custom Python modules set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/Checksum") set(PYTHONPATH "${PYTHONPATH}:${WarpX_SOURCE_DIR}/Regression/PostProcessingUtils") diff --git a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index 3831cb3dde8..0ade9d64259 100644 --- a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/beam_beam_collision/inputs_test_3d_beam_beam_collision # inputs - Examples/analysis_default_openpmd_regression.py # analysis + inputs_test_3d_beam_beam_collision # inputs + analysis_default_openpmd_regression.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Physics_applications/beam_beam_collision/analysis_default_openpmd_regression.py b/Examples/Physics_applications/beam_beam_collision/analysis_default_openpmd_regression.py new file mode 120000 index 00000000000..73e5ec47001 --- /dev/null +++ b/Examples/Physics_applications/beam_beam_collision/analysis_default_openpmd_regression.py @@ -0,0 +1 @@ +../../analysis_default_openpmd_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index f4008e97526..f11b7010aaf 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --pythonsolver" # inputs - Examples/Physics_applications/capacitive_discharge/analysis_1d.py # analysis + "inputs_base_1d_picmi.py --test --pythonsolver" # inputs + analysis_1d.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_background_mcc # inputs + analysis_default_regression.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -29,8 +29,8 @@ add_warpx_test( # 2 # dims # 2 # nprocs # OFF # eb -# Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_dp_psp # inputs -# Examples/analysis_default_regression.py # analysis +# inputs_test_2d_background_mcc_dp_psp # inputs +# analysis_default_regression.py # analysis # diags/diag1000050 # output # OFF # dependency #) @@ -40,8 +40,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/capacitive_discharge/inputs_test_2d_background_mcc_picmi.py # inputs - Examples/Physics_applications/capacitive_discharge/analysis_2d.py # analysis + inputs_test_2d_background_mcc_picmi.py # inputs + analysis_2d.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -51,8 +51,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - "Examples/Physics_applications/capacitive_discharge/inputs_base_1d_picmi.py --test --dsmc" # inputs - Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py # analysis + "inputs_base_1d_picmi.py --test --dsmc" # inputs + analysis_dsmc.py # analysis diags/diag1000050 # output OFF # dependency ) diff --git a/Examples/Physics_applications/capacitive_discharge/analysis_default_regression.py b/Examples/Physics_applications/capacitive_discharge/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Physics_applications/capacitive_discharge/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 75711172e27..1c808f5fc41 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_1d_laser_acceleration # inputs + analysis_default_regression.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid # inputs - Examples/Physics_applications/laser_acceleration/analysis_1d_fluid.py # analysis + inputs_test_1d_laser_acceleration_fluid # inputs + analysis_1d_fluid.py # analysis diags/diag1040000 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_fluid_boosted # inputs - Examples/Physics_applications/laser_acceleration/analysis_1d_fluid_boosted.py # analysis + inputs_test_1d_laser_acceleration_fluid_boosted # inputs + analysis_1d_fluid_boosted.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_1d_laser_acceleration_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_1d_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_boosted # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_laser_acceleration_boosted # inputs + analysis_default_regression.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_laser_acceleration_mr # inputs + analysis_default_regression.py # analysis diags/diag1000200 # output OFF # dependency ) @@ -72,8 +72,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_2d_laser_acceleration_mr_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_laser_acceleration_mr_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000200 # output OFF # dependency ) @@ -83,8 +83,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration # inputs - Examples/analysis_default_openpmd_regression.py # analysis + inputs_test_3d_laser_acceleration # inputs + analysis_default_openpmd_regression.py # analysis diags/diag1/ # output OFF # dependency ) @@ -94,8 +94,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -105,8 +105,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_3d_laser_acceleration_single_precision_comms # inputs - Examples/analysis_default_openpmd_regression.py # analysis + inputs_test_3d_laser_acceleration_single_precision_comms # inputs + analysis_default_openpmd_regression.py # analysis diags/diag1/ # output OFF # dependency ) @@ -116,8 +116,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_rz_laser_acceleration # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -127,8 +127,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_opmd # inputs - Examples/Physics_applications/laser_acceleration/analysis_openpmd_rz.py # analysis + inputs_test_rz_laser_acceleration_opmd # inputs + analysis_openpmd_rz.py # analysis diags/diag1/ # output OFF # dependency ) @@ -138,8 +138,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_rz_laser_acceleration_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_rz_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -149,8 +149,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_acceleration/inputs_test_2d_refined_injection # inputs - Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py # analysis + inputs_test_2d_refined_injection # inputs + analysis_refined_injection.py # analysis diags/diag1000200 # output OFF # dependency ) diff --git a/Examples/Physics_applications/laser_acceleration/analysis_default_openpmd_regression.py b/Examples/Physics_applications/laser_acceleration/analysis_default_openpmd_regression.py new file mode 120000 index 00000000000..73e5ec47001 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/analysis_default_openpmd_regression.py @@ -0,0 +1 @@ +../../analysis_default_openpmd_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/laser_acceleration/analysis_default_regression.py b/Examples/Physics_applications/laser_acceleration/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Physics_applications/laser_acceleration/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index 6d5a9e19f32..615ff8a2b49 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc # inputs - Examples/analysis_default_openpmd_regression.py # analysis + inputs_test_2d_laser_ion_acc # inputs + analysis_default_openpmd_regression.py # analysis diags/diag1/ # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/laser_ion/inputs_test_2d_laser_ion_acc_picmi.py # inputs - Examples/analysis_default_openpmd_regression.py # analysis + inputs_test_2d_laser_ion_acc_picmi.py # inputs + analysis_default_openpmd_regression.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Physics_applications/laser_ion/analysis_default_openpmd_regression.py b/Examples/Physics_applications/laser_ion/analysis_default_openpmd_regression.py new file mode 120000 index 00000000000..73e5ec47001 --- /dev/null +++ b/Examples/Physics_applications/laser_ion/analysis_default_openpmd_regression.py @@ -0,0 +1 @@ +../../analysis_default_openpmd_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index 737f7d242b7..f856728a46d 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_1d_plasma_acceleration_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_1d_plasma_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1001000 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_plasma_acceleration_mr # inputs + analysis_default_regression.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs + analysis_default_regression.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_2d_plasma_acceleration_boosted # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_plasma_acceleration_boosted # inputs + analysis_default_regression.py # analysis diags/diag1000020 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_plasma_acceleration_boosted # inputs + analysis_default_regression.py # analysis diags/diag1000005 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs + analysis_default_regression.py # analysis diags/diag1000025 # output OFF # dependency ) @@ -72,8 +72,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_plasma_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -83,8 +83,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_acceleration/inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000002 # output OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_acceleration/analysis_default_regression.py b/Examples/Physics_applications/plasma_acceleration/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Physics_applications/plasma_acceleration/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index 410565fb781..f880cadbdb1 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/plasma_mirror/inputs_test_2d_plasma_mirror # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_plasma_mirror # inputs + analysis_default_regression.py # analysis diags/diag1000020 # output OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_mirror/analysis_default_regression.py b/Examples/Physics_applications/plasma_mirror/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Physics_applications/plasma_mirror/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index e4e3f9ae1d2..4ab274e9cd7 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -7,8 +7,8 @@ add_warpx_test( RZ # dims 2 # nprocs ON # eb - Examples/Physics_applications/spacecraft_charging/inputs_test_rz_spacecraft_charging_picmi.py # inputs - Examples/Physics_applications/spacecraft_charging/analysis.py # analysis + inputs_test_rz_spacecraft_charging_picmi.py # inputs + analysis.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index 87379f357e0..2462ce03f92 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_test_2d_uniform_plasma # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_uniform_plasma # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_uniform_plasma # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Physics_applications/uniform_plasma/inputs_test_3d_uniform_plasma_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_3d_uniform_plasma_restart # inputs + analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_uniform_plasma # dependency ) diff --git a/Examples/Physics_applications/uniform_plasma/analysis_default_regression.py b/Examples/Physics_applications/uniform_plasma/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Physics_applications/uniform_plasma/analysis_default_restart.py b/Examples/Physics_applications/uniform_plasma/analysis_default_restart.py new file mode 120000 index 00000000000..0459986eebc --- /dev/null +++ b/Examples/Physics_applications/uniform_plasma/analysis_default_restart.py @@ -0,0 +1 @@ +../../analysis_default_restart.py \ No newline at end of file diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index ecb48d3339e..55720b21904 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles # inputs - Examples/Tests/accelerator_lattice/analysis.py # analysis + inputs_test_3d_hard_edged_quadrupoles # inputs + analysis.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_boosted # inputs - Examples/Tests/accelerator_lattice/analysis.py # analysis + inputs_test_3d_hard_edged_quadrupoles_boosted # inputs + analysis.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/accelerator_lattice/inputs_test_3d_hard_edged_quadrupoles_moving # inputs - Examples/Tests/accelerator_lattice/analysis.py # analysis + inputs_test_3d_hard_edged_quadrupoles_moving # inputs + analysis.py # analysis diags/diag1000050 # output OFF # dependency ) diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index a66a59005ba..1c6f200a238 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/boosted_diags/inputs_test_3d_laser_acceleration_btd # inputs - Examples/Tests/boosted_diags/analysis.py # analysis + inputs_test_3d_laser_acceleration_btd # inputs + analysis.py # analysis diags/diag1000003 # output OFF # dependency ) diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index 47b5b97fcf0..c653d778d77 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/boundaries/inputs_test_3d_particle_boundaries # inputs - Examples/Tests/boundaries/analysis.py # analysis + inputs_test_3d_particle_boundaries # inputs + analysis.py # analysis diags/diag1000008 # output OFF # dependency ) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index 8bff1cc7d9a..e79d5067ffe 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/btd_rz/inputs_test_rz_btd # inputs - Examples/Tests/btd_rz/analysis.py # analysis + inputs_test_rz_btd # inputs + analysis.py # analysis diags/diag1000289 # output OFF # dependency ) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index 899deaa22d7..cb66ed5caa2 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/collider_relevant_diags/inputs_test_3d_collider_diagnostics # inputs - Examples/Tests/collider_relevant_diags/analysis.py # analysis + inputs_test_3d_collider_diagnostics # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/collider_relevant_diags/analysis.py b/Examples/Tests/collider_relevant_diags/analysis.py index e8e169790c2..f6eb9de124f 100755 --- a/Examples/Tests/collider_relevant_diags/analysis.py +++ b/Examples/Tests/collider_relevant_diags/analysis.py @@ -61,7 +61,7 @@ def dL_dt(): return lumi -input_dict = parse_input_file("inputs_test_3d_collider_diagnostics") +input_dict = parse_input_file("warpx_used_inputs") Ex, Ey, Ez = [float(w) for w in input_dict["particles.E_external_particle"]] Bx, By, Bz = [float(w) for w in input_dict["particles.B_external_particle"]] diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index e2d5e7dc95f..5198a1104e8 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_1d_collision_z # inputs - Examples/Tests/collision/analysis_collision_1d.py # analysis + inputs_test_1d_collision_z # inputs + analysis_collision_1d.py # analysis diags/diag1000600 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_3d_collision_iso # inputs - Examples/Tests/collision/analysis_collision_3d_isotropization.py # analysis + inputs_test_3d_collision_iso # inputs + analysis_collision_3d_isotropization.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_rz_collision # inputs - Examples/Tests/collision/analysis_collision_rz.py # analysis + inputs_test_rz_collision # inputs + analysis_collision_rz.py # analysis diags/diag1000150 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_3d_collision_xyz # inputs - Examples/Tests/collision/analysis_collision_3d.py # analysis + inputs_test_3d_collision_xyz # inputs + analysis_collision_3d.py # analysis diags/diag1000150 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_2d_collision_xz # inputs - Examples/Tests/collision/analysis_collision_2d.py # analysis + inputs_test_2d_collision_xz # inputs + analysis_collision_2d.py # analysis diags/diag1000150 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/collision/inputs_test_2d_collision_xz_picmi.py # inputs - Examples/Tests/collision/analysis_collision_2d.py # analysis + inputs_test_2d_collision_xz_picmi.py # inputs + analysis_collision_2d.py # analysis diags/diag1000150 # output OFF # dependency ) diff --git a/Examples/Tests/diff_lumi_diag/CMakeLists.txt b/Examples/Tests/diff_lumi_diag/CMakeLists.txt index 2c2785bbdf2..38a36f4be5c 100644 --- a/Examples/Tests/diff_lumi_diag/CMakeLists.txt +++ b/Examples/Tests/diff_lumi_diag/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/diff_lumi_diag/inputs_test_3d_diff_lumi_diag # inputs - Examples/Tests/diff_lumi_diag/analysis.py # analysis + inputs_test_3d_diff_lumi_diag # inputs + analysis.py # analysis diags/diag1000080 # output OFF # dependency ) diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index 036c9e7500a..c22729a1386 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/divb_cleaning/inputs_test_3d_divb_cleaning # inputs - Examples/Tests/divb_cleaning/analysis.py # analysis + inputs_test_3d_divb_cleaning # inputs + analysis.py # analysis diags/diag1000400 # output OFF # dependency ) diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index 7a4709e7d40..a5a13197255 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/dive_cleaning/inputs_test_2d_dive_cleaning # inputs - Examples/Tests/dive_cleaning/analysis.py # analysis + inputs_test_2d_dive_cleaning # inputs + analysis.py # analysis diags/diag1000128 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/dive_cleaning/inputs_test_3d_dive_cleaning # inputs - Examples/Tests/dive_cleaning/analysis.py # analysis + inputs_test_3d_dive_cleaning # inputs + analysis.py # analysis diags/diag1000128 # output OFF # dependency ) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index d922aaa25a0..b1c44c62246 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc # inputs - Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis + inputs_test_2d_dirichlet_bc # inputs + analysis.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_dirichlet_bc/inputs_test_2d_dirichlet_bc_picmi.py # inputs - Examples/Tests/electrostatic_dirichlet_bc/analysis.py # analysis + inputs_test_2d_dirichlet_bc_picmi.py # inputs + analysis.py # analysis diags/diag1000100 # output OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 49f48aeb88a..8c62e7088cd 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere # inputs - Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + inputs_test_3d_electrostatic_sphere # inputs + analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame # inputs - Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + inputs_test_3d_electrostatic_sphere_lab_frame # inputs + analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs - Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs + analysis_electrostatic_sphere.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_test_3d_electrostatic_sphere_rel_nodal # inputs - Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + inputs_test_3d_electrostatic_sphere_rel_nodal # inputs + analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/electrostatic_sphere/inputs_test_rz_electrostatic_sphere # inputs - Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py # analysis + inputs_test_rz_electrostatic_sphere # inputs + analysis_electrostatic_sphere.py # analysis diags/diag1000030 # output OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 36940aaaa42..02b473d4cc0 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb # inputs - Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis + inputs_test_3d_electrostatic_sphere_eb # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs + analysis_default_regression.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -33,8 +33,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs - Examples/Tests/electrostatic_sphere_eb/analysis.py # analysis + inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs + analysis.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -46,8 +46,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb # inputs - Examples/Tests/electrostatic_sphere_eb/analysis_rz.py # analysis + inputs_test_rz_electrostatic_sphere_eb # inputs + analysis_rz.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -59,8 +59,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/electrostatic_sphere_eb/inputs_test_rz_electrostatic_sphere_eb_mr # inputs - Examples/Tests/electrostatic_sphere_eb/analysis_rz_mr.py # analysis + inputs_test_rz_electrostatic_sphere_eb_mr # inputs + analysis_rz_mr.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere_eb/analysis_default_regression.py b/Examples/Tests/electrostatic_sphere_eb/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/electrostatic_sphere_eb/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index 55f7079588a..fbf83b5fae4 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_test_2d_embedded_boundary_cube # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py # analysis + inputs_test_2d_embedded_boundary_cube # inputs + analysis_fields_2d.py # analysis diags/diag1000114 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + inputs_test_3d_embedded_boundary_cube # inputs + analysis_fields.py # analysis diags/diag1000208 # output OFF # dependency ) @@ -33,8 +33,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_cube/inputs_test_3d_embedded_boundary_cube_macroscopic # inputs - Examples/Tests/embedded_boundary_cube/analysis_fields.py # analysis + inputs_test_3d_embedded_boundary_cube_macroscopic # inputs + analysis_fields.py # analysis diags/diag1000208 # output OFF # dependency ) diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index e14620c6108..733c35f5e49 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/embedded_boundary_diffraction/inputs_test_rz_embedded_boundary_diffraction # inputs - Examples/Tests/embedded_boundary_diffraction/analysis_fields.py # analysis + inputs_test_rz_embedded_boundary_diffraction # inputs + analysis_fields.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index 6433a306565..b49ef1973c5 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_python_api/inputs_test_3d_embedded_boundary_picmi.py # inputs - Examples/Tests/embedded_boundary_python_api/analysis.py # analysis + inputs_test_3d_embedded_boundary_picmi.py # inputs + analysis.py # analysis diags/diag1000002 # output OFF # dependency ) diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 5c94ffdde92..3203de04039 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 2 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_test_2d_embedded_boundary_rotated_cube # inputs - Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py # analysis + inputs_test_2d_embedded_boundary_rotated_cube # inputs + analysis_fields_2d.py # analysis diags/diag1000068 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/embedded_boundary_rotated_cube/inputs_test_3d_embedded_boundary_rotated_cube # inputs - Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_3d.py # analysis + inputs_test_3d_embedded_boundary_rotated_cube # inputs + analysis_fields_3d.py # analysis diags/diag1000111 # output OFF # dependency ) diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index 8d36f8ca249..f9f8a125083 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb - Examples/Tests/embedded_circle/inputs_test_2d_embedded_circle # inputs - Examples/Tests/embedded_circle/analysis.py # analysis + inputs_test_2d_embedded_circle # inputs + analysis.py # analysis diags/diag1000011 OFF # dependency ) diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index 70a43b0ba63..ea114f82036 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/energy_conserving_thermal_plasma/inputs_test_2d_energy_conserving_thermal_plasma # inputs - Examples/Tests/energy_conserving_thermal_plasma/analysis.py # analysis + inputs_test_2d_energy_conserving_thermal_plasma # inputs + analysis.py # analysis diags/diag1000500 # output OFF # dependency ) diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index 580702d9bbb..272ee94c718 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 2 # dims 2 # nprocs ON # eb - Examples/Tests/field_probe/inputs_test_2d_field_probe # inputs - Examples/Tests/field_probe/analysis.py # analysis + inputs_test_2d_field_probe # inputs + analysis.py # analysis diags/diag1000544 # output OFF # dependency ) diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index 3a7bee3c3e9..a38f943ae52 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/flux_injection/inputs_test_3d_flux_injection # inputs - Examples/Tests/flux_injection/analysis_flux_injection_3d.py # analysis + inputs_test_3d_flux_injection # inputs + analysis_flux_injection_3d.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/flux_injection/inputs_test_rz_flux_injection # inputs - Examples/Tests/flux_injection/analysis_flux_injection_rz.py # analysis + inputs_test_rz_flux_injection # inputs + analysis_flux_injection_rz.py # analysis diags/diag1000120 # output OFF # dependency ) diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 430ecc4137c..4309e515fd3 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/inputs_test_3d_focusing_gaussian_beam # inputs - Examples/Tests/gaussian_beam/analysis.py # analysis + inputs_test_3d_focusing_gaussian_beam # inputs + analysis.py # analysis diags/diag1000000 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/gaussian_beam/inputs_test_3d_gaussian_beam_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_gaussian_beam_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/gaussian_beam/analysis_default_regression.py b/Examples/Tests/gaussian_beam/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/gaussian_beam/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 165678456d0..0a11b8e05b2 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_test_1d_semi_implicit_picard # inputs - Examples/Tests/implicit/analysis_1d.py # analysis + inputs_test_1d_semi_implicit_picard # inputs + analysis_1d.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_test_1d_theta_implicit_picard # inputs - Examples/Tests/implicit/analysis_1d.py # analysis + inputs_test_1d_theta_implicit_picard # inputs + analysis_1d.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb # inputs - Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis + inputs_test_2d_theta_implicit_jfnk_vandb # inputs + analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/implicit/inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs - Examples/Tests/implicit/analysis_vandb_jfnk_2d.py # analysis + inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs + analysis_vandb_jfnk_2d.py # analysis diags/diag1000020 # output OFF # dependency ) diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 69c9ab3eb7d..5d5ff149f11 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/initial_distribution/inputs_test_3d_initial_distribution # inputs - Examples/Tests/initial_distribution/analysis.py # analysis + inputs_test_3d_initial_distribution # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/initial_plasma_profile/CMakeLists.txt b/Examples/Tests/initial_plasma_profile/CMakeLists.txt index c54e73d617e..40d81c7e9e2 100644 --- a/Examples/Tests/initial_plasma_profile/CMakeLists.txt +++ b/Examples/Tests/initial_plasma_profile/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/initial_plasma_profile/inputs_test_2d_parabolic_channel_initialization # inputs - Examples/Tests/initial_plasma_profile/analysis.py # analysis + inputs_test_2d_parabolic_channel_initialization # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index 74cf2d2f9e3..904421312a7 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/ion_stopping/inputs_test_3d_ion_stopping # inputs - Examples/Tests/ion_stopping/analysis.py # analysis + inputs_test_3d_ion_stopping # inputs + analysis.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index 93f97f76039..b722dd72614 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_test_2d_ionization_boost # inputs - Examples/Tests/ionization/analysis.py # analysis + inputs_test_2d_ionization_boost # inputs + analysis.py # analysis diags/diag1000420 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_test_2d_ionization_lab # inputs - Examples/Tests/ionization/analysis.py # analysis + inputs_test_2d_ionization_lab # inputs + analysis.py # analysis diags/diag1001600 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/ionization/inputs_test_2d_ionization_picmi.py # inputs - Examples/Tests/ionization/analysis.py # analysis + inputs_test_2d_ionization_picmi.py # inputs + analysis.py # analysis diags/diag1001600 # output OFF # dependency ) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 085521058f0..12a02784c57 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_1d_langmuir_multi # inputs - Examples/Tests/langmuir/analysis_1d.py # analysis + inputs_test_1d_langmuir_multi # inputs + analysis_1d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_mr # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_anisotropic # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_mr_anisotropic # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -51,8 +51,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_mr_psatd # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_mr_psatd # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -63,8 +63,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_nodal # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_nodal # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -74,8 +74,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -86,8 +86,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -99,8 +99,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_current_correction # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -112,8 +112,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -125,8 +125,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -138,8 +138,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_multiJ # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -151,8 +151,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -164,8 +164,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_nodal # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_nodal # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -177,8 +177,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -190,8 +190,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -203,8 +203,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs - Examples/Tests/langmuir/analysis_2d.py # analysis + inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -215,8 +215,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -226,8 +226,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_nodal # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_nodal # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -237,8 +237,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -249,8 +249,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -262,8 +262,8 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_current_correction # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -275,8 +275,8 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -288,8 +288,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -301,8 +301,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -314,8 +314,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_multiJ # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -327,8 +327,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -340,8 +340,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_nodal # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_nodal # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -353,8 +353,8 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -366,8 +366,8 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs - Examples/Tests/langmuir/analysis_3d.py # analysis + inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -378,8 +378,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_rz_langmuir_multi # inputs - Examples/Tests/langmuir/analysis_rz.py # analysis + inputs_test_rz_langmuir_multi # inputs + analysis_rz.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -389,8 +389,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_rz_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -401,8 +401,8 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd # inputs - Examples/Tests/langmuir/analysis_rz.py # analysis + inputs_test_rz_langmuir_multi_psatd # inputs + analysis_rz.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -414,8 +414,8 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_current_correction # inputs - Examples/Tests/langmuir/analysis_rz.py # analysis + inputs_test_rz_langmuir_multi_psatd_current_correction # inputs + analysis_rz.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -427,8 +427,8 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir/inputs_test_rz_langmuir_multi_psatd_multiJ # inputs - Examples/Tests/langmuir/analysis_rz.py # analysis + inputs_test_rz_langmuir_multi_psatd_multiJ # inputs + analysis_rz.py # analysis diags/diag1000080 # output OFF # dependency ) diff --git a/Examples/Tests/langmuir/analysis_default_regression.py b/Examples/Tests/langmuir/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/langmuir/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index 464335fb49d..cb927228e2e 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_test_1d_langmuir_fluid # inputs - Examples/Tests/langmuir_fluids/analysis_1d.py # analysis + inputs_test_1d_langmuir_fluid # inputs + analysis_1d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_test_2d_langmuir_fluid # inputs - Examples/Tests/langmuir_fluids/analysis_2d.py # analysis + inputs_test_2d_langmuir_fluid # inputs + analysis_2d.py # analysis diags/diag1000080 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_test_3d_langmuir_fluid # inputs - Examples/Tests/langmuir_fluids/analysis_3d.py # analysis + inputs_test_3d_langmuir_fluid # inputs + analysis_3d.py # analysis diags/diag1000040 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/langmuir_fluids/inputs_test_rz_langmuir_fluid # inputs - Examples/Tests/langmuir_fluids/analysis_rz.py # analysis + inputs_test_rz_langmuir_fluid # inputs + analysis_rz.py # analysis diags/diag1000080 # output OFF # dependency ) diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index 933f7590e33..c66615c5bb3 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/larmor/inputs_test_2d_larmor # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_larmor # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/larmor/analysis_default_regression.py b/Examples/Tests/larmor/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/larmor/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index ad373471212..533f87cc13a 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_test_1d_laser_injection # inputs - Examples/Tests/laser_injection/analysis_1d.py # analysis + inputs_test_1d_laser_injection # inputs + analysis_1d.py # analysis diags/diag1000240 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_test_2d_laser_injection # inputs - Examples/Tests/laser_injection/analysis_2d.py # analysis + inputs_test_2d_laser_injection # inputs + analysis_2d.py # analysis diags/diag1000240 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_injection/inputs_test_3d_laser_injection # inputs - Examples/Tests/laser_injection/analysis_3d.py # analysis + inputs_test_3d_laser_injection # inputs + analysis_3d.py # analysis diags/diag1000020 # output OFF # dependency ) diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index b4cbe5194ad..311f6b0f11b 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -6,7 +6,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file_prepare.py # inputs + inputs_test_2d_laser_injection_from_binary_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_binary_file # inputs - Examples/Tests/laser_injection_from_file/analysis_2d_binary.py # analysis + inputs_test_2d_laser_injection_from_binary_file # inputs + analysis_2d_binary.py # analysis diags/diag1000250 # output test_2d_laser_injection_from_binary_file_prepare # dependency ) @@ -28,7 +28,7 @@ add_warpx_test( 1 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_prepare.py # inputs + inputs_test_1d_laser_injection_from_lasy_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -39,8 +39,8 @@ add_warpx_test( 1 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_1d.py # analysis + inputs_test_1d_laser_injection_from_lasy_file # inputs + analysis_1d.py # analysis diags/diag1000251 # output test_1d_laser_injection_from_lasy_file_prepare # dependency ) @@ -50,7 +50,7 @@ add_warpx_test( 1 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py # inputs + inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -61,8 +61,8 @@ add_warpx_test( 1 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_1d_laser_injection_from_lasy_file_boost # inputs - Examples/Tests/laser_injection_from_file/analysis_1d_boost.py # analysis + inputs_test_1d_laser_injection_from_lasy_file_boost # inputs + analysis_1d_boost.py # analysis diags/diag1000001 # output test_1d_laser_injection_from_lasy_file_boost_prepare # dependency ) @@ -72,7 +72,7 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file_prepare.py # inputs + inputs_test_2d_laser_injection_from_lasy_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -83,8 +83,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_2d_laser_injection_from_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_2d.py # analysis + inputs_test_2d_laser_injection_from_lasy_file # inputs + analysis_2d.py # analysis diags/diag1000251 # output test_2d_laser_injection_from_lasy_file_prepare # dependency ) @@ -94,7 +94,7 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file_prepare.py # inputs + inputs_test_3d_laser_injection_from_lasy_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -105,8 +105,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_3d_laser_injection_from_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_3d.py # analysis + inputs_test_3d_laser_injection_from_lasy_file # inputs + analysis_3d.py # analysis diags/diag1000251 # output test_3d_laser_injection_from_lasy_file_prepare # dependency ) @@ -116,7 +116,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file_prepare.py # inputs + inputs_test_rz_laser_injection_from_lasy_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -127,8 +127,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_rz.py # analysis + inputs_test_rz_laser_injection_from_lasy_file # inputs + analysis_rz.py # analysis diags/diag1000252 # output test_rz_laser_injection_from_lasy_file_prepare # dependency ) @@ -138,7 +138,7 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py # inputs + inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py # inputs OFF # analysis OFF # output OFF # dependency @@ -149,8 +149,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/laser_injection_from_file/inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs - Examples/Tests/laser_injection_from_file/analysis_from_RZ_file.py # analysis + inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs + analysis_from_RZ_file.py # analysis diags/diag1000612 # output test_rz_laser_injection_from_RZ_lasy_file_prepare # dependency ) diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index 2b63783c7c8..c0f99b09f3e 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/laser_on_fine/inputs_test_2d_laser_on_fine # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_laser_on_fine # inputs + analysis_default_regression.py # analysis diags/diag1000050 # output OFF # dependency ) diff --git a/Examples/Tests/laser_on_fine/analysis_default_regression.py b/Examples/Tests/laser_on_fine/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/laser_on_fine/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index a54bcfabb88..7fba7d4defe 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_3d_load_external_field_grid_picmi.py # inputs - Examples/Tests/load_external_field/analysis_3d.py # analysis + inputs_test_3d_load_external_field_grid_picmi.py # inputs + analysis_3d.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_3d_load_external_field_particle_picmi.py # inputs - Examples/Tests/load_external_field/analysis_3d.py # analysis + inputs_test_3d_load_external_field_particle_picmi.py # inputs + analysis_3d.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid # inputs - Examples/Tests/load_external_field/analysis_rz.py # analysis + inputs_test_rz_load_external_field_grid # inputs + analysis_rz.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_rz_load_external_field_grid_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_rz_load_external_field_grid_restart # inputs + analysis_default_restart.py # analysis diags/diag1000300 # output test_rz_load_external_field_grid # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles # inputs - Examples/Tests/load_external_field/analysis_rz.py # analysis + inputs_test_rz_load_external_field_particles # inputs + analysis_rz.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/load_external_field/inputs_test_rz_load_external_field_particles_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_rz_load_external_field_particles_restart # inputs + analysis_default_restart.py # analysis diags/diag1000300 # output test_rz_load_external_field_particles # dependency ) diff --git a/Examples/Tests/load_external_field/analysis_default_restart.py b/Examples/Tests/load_external_field/analysis_default_restart.py new file mode 120000 index 00000000000..0459986eebc --- /dev/null +++ b/Examples/Tests/load_external_field/analysis_default_restart.py @@ -0,0 +1 @@ +../../analysis_default_restart.py \ No newline at end of file diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index d69e0db4ca8..1420a7186ad 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_magnetostatic_eb # inputs + analysis_default_regression.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) 3 # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_test_3d_magnetostatic_eb_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_magnetostatic_eb_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -33,8 +33,8 @@ if(WarpX_EB) RZ # dims 1 # nprocs ON # eb - Examples/Tests/magnetostatic_eb/inputs_test_rz_magnetostatic_eb_picmi.py # inputs - Examples/Tests/magnetostatic_eb/analysis_rz.py # analysis + inputs_test_rz_magnetostatic_eb_picmi.py # inputs + analysis_rz.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/magnetostatic_eb/analysis_default_regression.py b/Examples/Tests/magnetostatic_eb/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/magnetostatic_eb/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index c22da5a141e..1d684c6e0f7 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/maxwell_hybrid_qed/inputs_test_2d_maxwell_hybrid_qed_solver # inputs - Examples/Tests/maxwell_hybrid_qed/analysis.py # analysis + inputs_test_2d_maxwell_hybrid_qed_solver # inputs + analysis.py # analysis diags/diag1000300 # output OFF # dependency ) diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index a368bfea489..e59098821b3 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector # inputs - Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis + inputs_test_2d_nci_corrector # inputs + analysis_ncicorr.py # analysis diags/diag1000600 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_fdtd_stability/inputs_test_2d_nci_corrector_mr # inputs - Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py # analysis + inputs_test_2d_nci_corrector_mr # inputs + analysis_ncicorr.py # analysis diags/diag1000600 # output OFF # dependency ) diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 2c4f80a68ba..52d0241f1b9 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_2d_averaged_galilean_psatd # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_averaged_galilean_psatd_hybrid # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_2d_averaged_galilean_psatd_hybrid # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -33,8 +33,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_3d_averaged_galilean_psatd # inputs + analysis_galilean.py # analysis diags/diag1000160 # output OFF # dependency ) @@ -46,8 +46,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_averaged_galilean_psatd_hybrid # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_3d_averaged_galilean_psatd_hybrid # inputs + analysis_galilean.py # analysis diags/diag1000160 # output OFF # dependency ) @@ -59,8 +59,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_comoving_psatd_hybrid # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_comoving_psatd_hybrid # inputs + analysis_default_regression.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -72,8 +72,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_2d_galilean_psatd # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -85,8 +85,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_2d_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -98,8 +98,8 @@ if(WarpX_FFT) 2 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_current_correction_psb # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_2d_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -111,8 +111,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_2d_galilean_psatd_hybrid # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_galilean_psatd_hybrid # inputs + analysis_default_regression.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -124,8 +124,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_3d_galilean_psatd # inputs + analysis_galilean.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -137,8 +137,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_3d_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -150,8 +150,8 @@ if(WarpX_FFT) 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_galilean_psatd_current_correction_psb # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_3d_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -163,8 +163,8 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_rz_galilean_psatd # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -176,8 +176,8 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_rz_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -189,8 +189,8 @@ if(WarpX_FFT) RZ # dims 1 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_rz_galilean_psatd_current_correction_psb # inputs - Examples/Tests/nci_psatd_stability/analysis_galilean.py # analysis + inputs_test_rz_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis diags/diag1000400 # output OFF # dependency ) @@ -202,8 +202,8 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_rz_multiJ_psatd # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_rz_multiJ_psatd # inputs + analysis_default_regression.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -215,8 +215,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nci_psatd_stability/inputs_test_3d_uniform_plasma_multiJ # inputs - Examples/Tests/nci_psatd_stability/analysis_multiJ.py # analysis + inputs_test_3d_uniform_plasma_multiJ # inputs + analysis_multiJ.py # analysis diags/diag1000300 # output OFF # dependency ) diff --git a/Examples/Tests/nci_psatd_stability/analysis_default_regression.py b/Examples/Tests/nci_psatd_stability/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/nci_psatd_stability/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index 071401ffc3c..e516edc8af6 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nodal_electrostatic/inputs_test_3d_nodal_electrostatic_solver # inputs - Examples/Tests/nodal_electrostatic/analysis.py # analysis + inputs_test_3d_nodal_electrostatic_solver # inputs + analysis.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 064ce07020c..8be92ab7bda 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion # inputs - Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + inputs_test_3d_deuterium_deuterium_fusion # inputs + analysis_two_product_fusion.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs - Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py # analysis + inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs + analysis_deuterium_deuterium_3d_intraspecies.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_3d_deuterium_tritium_fusion # inputs - Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + inputs_test_3d_deuterium_tritium_fusion # inputs + analysis_two_product_fusion.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_rz_deuterium_tritium_fusion # inputs - Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py # analysis + inputs_test_rz_deuterium_tritium_fusion # inputs + analysis_two_product_fusion.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_2d_proton_boron_fusion # inputs - Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis + inputs_test_2d_proton_boron_fusion # inputs + analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/nuclear_fusion/inputs_test_3d_proton_boron_fusion # inputs - Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py # analysis + inputs_test_3d_proton_boron_fusion # inputs + analysis_proton_boron_fusion.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index 85b2fad315b..8aa6e411d7b 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - "Examples/Tests/ohm_solver_em_modes/inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs - Examples/Tests/ohm_solver_em_modes/analysis.py # analysis + "inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs + analysis.py # analysis diags/field_diag000250 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - "Examples/Tests/ohm_solver_em_modes/inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs - Examples/Tests/ohm_solver_em_modes/analysis_rz.py # analysis + "inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs + analysis_rz.py # analysis diags/diag1000100 # output OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt index 1d472caea0c..0e9a960b0fe 100644 --- a/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - "Examples/Tests/ohm_solver_ion_Landau_damping/inputs_test_2d_ohm_solver_landau_damping_picmi.py --test --dim 2 --temp_ratio 0.1" # inputs - Examples/Tests/ohm_solver_ion_Landau_damping/analysis.py # analysis + "inputs_test_2d_ohm_solver_landau_damping_picmi.py --test --dim 2 --temp_ratio 0.1" # inputs + analysis.py # analysis diags/diag1000100 # output OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt index 113311fc944..07818c28ce4 100644 --- a/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - "Examples/Tests/ohm_solver_ion_beam_instability/inputs_test_1d_ohm_solver_ion_beam_picmi.py --test --dim 1 --resonant" # inputs - Examples/Tests/ohm_solver_ion_beam_instability/analysis.py # analysis + "inputs_test_1d_ohm_solver_ion_beam_picmi.py --test --dim 1 --resonant" # inputs + analysis.py # analysis diags/diag1002500 # output OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt index 12454407914..6bf33dc6f31 100644 --- a/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - "Examples/Tests/ohm_solver_magnetic_reconnection/inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py --test" # inputs - Examples/Tests/ohm_solver_magnetic_reconnection/analysis.py # analysis + "inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py --test" # inputs + analysis.py # analysis diags/diag1000020 # output OFF # dependency ) diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index f6a24affc7a..a5282af1e5d 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/open_bc_poisson_solver/inputs_test_3d_open_bc_poisson_solver # inputs - Examples/Tests/open_bc_poisson_solver/analysis.py # analysis + inputs_test_3d_open_bc_poisson_solver # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index decb50ea809..18f8be57401 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_interaction/inputs_test_rz_particle_boundary_interaction_picmi.py # inputs - Examples/Tests/particle_boundary_interaction/analysis.py # analysis + inputs_test_rz_particle_boundary_interaction_picmi.py # inputs + analysis.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index 48eacb3901c..edcf12a6311 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_process/inputs_test_3d_particle_absorption # inputs - Examples/Tests/particle_boundary_process/analysis_absorption.py # analysis + inputs_test_3d_particle_absorption # inputs + analysis_absorption.py # analysis diags/diag1000060 # output OFF # dependency ) @@ -19,8 +19,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/particle_boundary_process/inputs_test_2d_particle_reflection_picmi.py # inputs - Examples/Tests/particle_boundary_process/analysis_reflection.py # analysis + inputs_test_2d_particle_reflection_picmi.py # inputs + analysis_reflection.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 4884f9540bc..38dc57e9ccd 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape # inputs - Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + inputs_test_3d_particle_scrape # inputs + analysis_scrape.py # analysis diags/diag1000060 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/particle_boundary_scrape/inputs_test_3d_particle_scrape_picmi.py # inputs - Examples/Tests/particle_boundary_scrape/analysis_scrape.py # analysis + inputs_test_3d_particle_scrape_picmi.py # inputs + analysis_scrape.py # analysis diags/diag1000060 # output OFF # dependency ) diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index 1ab54d8bbf5..a57453cf91d 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_data_python/inputs_test_2d_prev_positions_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_prev_positions_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py # inputs - Examples/Tests/particle_data_python/analysis.py # analysis + inputs_test_2d_particle_attr_access_picmi.py # inputs + analysis.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - "Examples/Tests/particle_data_python/inputs_test_2d_particle_attr_access_picmi.py --unique" # inputs - Examples/Tests/particle_data_python/analysis.py # analysis + "inputs_test_2d_particle_attr_access_picmi.py --unique" # inputs + analysis.py # analysis diags/diag1000010 # output OFF # dependency ) diff --git a/Examples/Tests/particle_data_python/analysis_default_regression.py b/Examples/Tests/particle_data_python/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/particle_data_python/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 91209291c0c..1fc6ce46116 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs - Examples/Tests/particle_fields_diags/analysis_particle_diags.py # analysis + inputs_test_3d_particle_fields_diags # inputs + analysis_particle_diags.py # analysis diags/diag1000200 # output OFF # dependency ) @@ -18,8 +18,8 @@ add_warpx_test( # 3 # dims # 2 # nprocs # OFF # eb -# Examples/Tests/particle_fields_diags/inputs_test_3d_particle_fields_diags # inputs -# Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py # analysis +# inputs_test_3d_particle_fields_diags # inputs +# analysis_particle_diags_single.py # analysis # diags/diag1000200 # output # OFF # dependency #) diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index 81f20740535..ec37d936bb6 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/particle_pusher/inputs_test_3d_particle_pusher # inputs - Examples/Tests/particle_pusher/analysis.py # analysis + inputs_test_3d_particle_pusher # inputs + analysis.py # analysis diags/diag1010000 # output OFF # dependency ) diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index c1f8eff36f9..951f92515ee 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particle_thermal_boundary/inputs_test_2d_particle_thermal_boundary # inputs - Examples/Tests/particle_thermal_boundary/analysis.py # analysis + inputs_test_2d_particle_thermal_boundary # inputs + analysis.py # analysis diags/diag1002000 # output OFF # dependency ) diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index 315c4d40a7e..00007a44741 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml # inputs - Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + inputs_test_2d_particles_in_pml # inputs + analysis_particles_in_pml.py # analysis diags/diag1000180 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_test_2d_particles_in_pml_mr # inputs - Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + inputs_test_2d_particles_in_pml_mr # inputs + analysis_particles_in_pml.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml # inputs - Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + inputs_test_3d_particles_in_pml # inputs + analysis_particles_in_pml.py # analysis diags/diag1000120 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/particles_in_pml/inputs_test_3d_particles_in_pml_mr # inputs - Examples/Tests/particles_in_pml/analysis_particles_in_pml.py # analysis + inputs_test_3d_particles_in_pml_mr # inputs + analysis_particles_in_pml.py # analysis diags/diag1000200 # output OFF # dependency ) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index 34a903dcc12..f9f652691e1 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -10,8 +10,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pass_mpi_communicator/inputs_test_2d_pass_mpi_comm_picmi.py # inputs - OFF #Examples/Tests/pass_mpi_communicator/analysis.py # analysis + inputs_test_2d_pass_mpi_comm_picmi.py # inputs + OFF #analysis.py # analysis OFF # output OFF # dependency ) diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index bd12aae55a1..97516ddbc28 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_test_3d_pec_field # inputs - Examples/Tests/pec/analysis_pec.py # analysis + inputs_test_3d_pec_field # inputs + analysis_pec.py # analysis diags/diag1000125 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_test_3d_pec_field_mr # inputs - Examples/Tests/pec/analysis_pec_mr.py # analysis + inputs_test_3d_pec_field_mr # inputs + analysis_pec_mr.py # analysis diags/diag1000125 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pec/inputs_test_3d_pec_particle # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_pec_particle # inputs + analysis_default_regression.py # analysis diags/diag1000020 # output OFF # dependency ) diff --git a/Examples/Tests/pec/analysis_default_regression.py b/Examples/Tests/pec/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/pec/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index e55ad5bdece..1a86ef0b88f 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/photon_pusher/inputs_test_3d_photon_pusher # inputs - Examples/Tests/photon_pusher/analysis.py # analysis + inputs_test_3d_photon_pusher # inputs + analysis.py # analysis diags/diag1000050 # output OFF # dependency ) diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index a51b3567c62..60a4c95bdea 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens # inputs - Examples/Tests/plasma_lens/analysis.py # analysis + inputs_test_3d_plasma_lens # inputs + analysis.py # analysis diags/diag1000084 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_boosted # inputs - Examples/Tests/plasma_lens/analysis.py # analysis + inputs_test_3d_plasma_lens_boosted # inputs + analysis.py # analysis diags/diag1000084 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_hard_edged # inputs - Examples/Tests/plasma_lens/analysis.py # analysis + inputs_test_3d_plasma_lens_hard_edged # inputs + analysis.py # analysis diags/diag1000084 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_picmi.py # inputs - Examples/Tests/plasma_lens/analysis.py # analysis + inputs_test_3d_plasma_lens_picmi.py # inputs + analysis.py # analysis diags/diag1000084 # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/plasma_lens/inputs_test_3d_plasma_lens_short # inputs - Examples/Tests/plasma_lens/analysis.py # analysis + inputs_test_3d_plasma_lens_short # inputs + analysis.py # analysis diags/diag1000084 # output OFF # dependency ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 8b5943999c3..321ea3669ed 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs + analysis_default_regression.py # analysis diags/diag1000100 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_FFT) RZ # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_rz_pml_psatd # inputs - Examples/Tests/pml/analysis_pml_psatd_rz.py # analysis + inputs_test_rz_pml_psatd # inputs + analysis_pml_psatd_rz.py # analysis diags/diag1000500 # output OFF # dependency ) @@ -32,8 +32,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_ckc # inputs - Examples/Tests/pml/analysis_pml_ckc.py # analysis + inputs_test_2d_pml_x_ckc # inputs + analysis_pml_ckc.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -43,8 +43,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_galilean # inputs - Examples/Tests/pml/analysis_pml_psatd.py # analysis + inputs_test_2d_pml_x_galilean # inputs + analysis_pml_psatd.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -54,8 +54,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_psatd # inputs - Examples/Tests/pml/analysis_pml_psatd.py # analysis + inputs_test_2d_pml_x_psatd # inputs + analysis_pml_psatd.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -65,8 +65,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_psatd_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_2d_pml_x_psatd_restart # inputs + analysis_default_restart.py # analysis diags/diag1000300 # output test_2d_pml_x_psatd # dependency ) @@ -76,8 +76,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_yee # inputs - Examples/Tests/pml/analysis_pml_yee.py # analysis + inputs_test_2d_pml_x_yee # inputs + analysis_pml_yee.py # analysis diags/diag1000300 # output OFF # dependency ) @@ -87,8 +87,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/pml/inputs_test_2d_pml_x_yee_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_2d_pml_x_yee_restart # inputs + analysis_default_restart.py # analysis diags/diag1000300 # output test_2d_pml_x_yee # dependency ) diff --git a/Examples/Tests/pml/analysis_default_regression.py b/Examples/Tests/pml/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/pml/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/pml/analysis_default_restart.py b/Examples/Tests/pml/analysis_default_restart.py new file mode 120000 index 00000000000..0459986eebc --- /dev/null +++ b/Examples/Tests/pml/analysis_default_restart.py @@ -0,0 +1 @@ +../../analysis_default_restart.py \ No newline at end of file diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index aa28408f563..e3ed23a67c2 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) 3 # dims 2 # nprocs ON # eb - Examples/Tests/point_of_contact_eb/inputs_test_3d_point_of_contact_eb # inputs - Examples/Tests/point_of_contact_eb/analysis.py # analysis + inputs_test_3d_point_of_contact_eb # inputs + analysis.py # analysis diags/diag1/ # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/point_of_contact_eb/inputs_test_rz_point_of_contact_eb # inputs - Examples/Tests/point_of_contact_eb/analysis.py # analysis + inputs_test_rz_point_of_contact_eb # inputs + analysis.py # analysis diags/diag1/ # output OFF # dependency ) diff --git a/Examples/Tests/projection_divb_cleaner/CMakeLists.txt b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt index edae6c72d8d..48264372872 100644 --- a/Examples/Tests/projection_divb_cleaner/CMakeLists.txt +++ b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_projection_divb_cleaner_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 1 # nprocs OFF # eb - Examples/Tests/projection_divb_cleaner/inputs_test_3d_projection_divb_cleaner_callback_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_projection_divb_cleaner_callback_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( RZ # dims 1 # nprocs OFF # eb - Examples/Tests/projection_divb_cleaner/inputs_test_rz_projection_divb_cleaner # inputs - Examples/Tests/projection_divb_cleaner/analysis.py # analysis + inputs_test_rz_projection_divb_cleaner # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/projection_divb_cleaner/analysis_default_regression.py b/Examples/Tests/projection_divb_cleaner/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/projection_divb_cleaner/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index 1cde644ee1b..f7ba5cc099d 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/python_wrappers/inputs_test_2d_python_wrappers_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_python_wrappers_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000100 # output OFF # dependency ) diff --git a/Examples/Tests/python_wrappers/analysis_default_regression.py b/Examples/Tests/python_wrappers/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/python_wrappers/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index dd2b8009eff..42c36660801 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler # inputs - Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis + inputs_test_2d_qed_breit_wheeler # inputs + analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_2d_qed_breit_wheeler_opmd # inputs - Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis + inputs_test_2d_qed_breit_wheeler_opmd # inputs + analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler # inputs - Examples/Tests/qed/analysis_breit_wheeler_yt.py # analysis + inputs_test_3d_qed_breit_wheeler # inputs + analysis_breit_wheeler_yt.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_breit_wheeler_opmd # inputs - Examples/Tests/qed/analysis_breit_wheeler_opmd.py # analysis + inputs_test_3d_qed_breit_wheeler_opmd # inputs + analysis_breit_wheeler_opmd.py # analysis diags/diag1/ # output OFF # dependency ) @@ -50,8 +50,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_2d_qed_quantum_sync # inputs - Examples/Tests/qed/analysis_quantum_sync.py # analysis + inputs_test_2d_qed_quantum_sync # inputs + analysis_quantum_sync.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -61,8 +61,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_quantum_sync # inputs - Examples/Tests/qed/analysis_quantum_sync.py # analysis + inputs_test_3d_qed_quantum_sync # inputs + analysis_quantum_sync.py # analysis diags/diag1000002 # output OFF # dependency ) @@ -72,8 +72,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_schwinger_1 # inputs - Examples/Tests/qed/analysis_schwinger.py # analysis + inputs_test_3d_qed_schwinger_1 # inputs + analysis_schwinger.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -83,8 +83,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_schwinger_2 # inputs - Examples/Tests/qed/analysis_schwinger.py # analysis + inputs_test_3d_qed_schwinger_2 # inputs + analysis_schwinger.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -94,8 +94,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_schwinger_3 # inputs - Examples/Tests/qed/analysis_schwinger.py # analysis + inputs_test_3d_qed_schwinger_3 # inputs + analysis_schwinger.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -105,8 +105,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/qed/inputs_test_3d_qed_schwinger_4 # inputs - Examples/Tests/qed/analysis_schwinger.py # analysis + inputs_test_3d_qed_schwinger_4 # inputs + analysis_schwinger.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index d26f5c4d6ce..bc4b47664d2 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/radiation_reaction/inputs_test_3d_radiation_reaction # inputs - Examples/Tests/radiation_reaction/analysis.py # analysis + inputs_test_3d_radiation_reaction # inputs + analysis.py # analysis diags/diag1000064 # output OFF # dependency ) diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index 4214c0f5914..b27fb9d929d 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags # inputs - Examples/Tests/reduced_diags/analysis_reduced_diags.py # analysis + inputs_test_3d_reduced_diags # inputs + analysis_reduced_diags.py # analysis diags/diag1000200 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs - Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs + analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs - Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs + analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs - Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs + analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output OFF # dependency ) @@ -51,8 +51,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/reduced_diags/inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs - Examples/Tests/reduced_diags/analysis_reduced_diags_load_balance_costs.py # analysis + inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs + analysis_reduced_diags_load_balance_costs.py # analysis diags/diag1000003 # output OFF # dependency ) diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index 0bcd59920ae..329bc1e1e1c 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/relativistic_space_charge_initialization/inputs_test_3d_relativistic_space_charge_initialization # inputs - Examples/Tests/relativistic_space_charge_initialization/analysis.py # analysis + inputs_test_3d_relativistic_space_charge_initialization # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index 494cee234cd..c8e451ba5fe 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/repelling_particles/inputs_test_2d_repelling_particles # inputs - Examples/Tests/repelling_particles/analysis.py # analysis + inputs_test_2d_repelling_particles # inputs + analysis.py # analysis diags/diag1000200 # output OFF # dependency ) diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index 01a56accd4c..2ff16d3cd55 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_test_2d_leveling_thinning # inputs - Examples/Tests/resampling/analysis.py # analysis + inputs_test_2d_leveling_thinning # inputs + analysis.py # analysis diags/diag1000008 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_1d_resample_velocity_coincidence_thinning # inputs + analysis_default_regression.py # analysis diags/diag1000004 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/resampling/inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs + analysis_default_regression.py # analysis diags/diag1000004 # output OFF # dependency ) diff --git a/Examples/Tests/resampling/analysis_default_regression.py b/Examples/Tests/resampling/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/resampling/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 6488900655b..170dceca96e 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_2d_id_cpu_read_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_id_cpu_read_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -20,8 +20,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py # inputs - OFF #Examples/analysis_default_regression.py # analysis + inputs_test_2d_runtime_components_picmi.py # inputs + OFF #analysis_default_regression.py # analysis OFF #diags/diag1000010 # output OFF # dependency ) @@ -34,8 +34,8 @@ add_warpx_test( 2 # dims 1 # nprocs OFF # eb - "Examples/Tests/restart/inputs_test_2d_runtime_components_picmi.py amr.restart='../test_2d_runtime_components_picmi/diags/chk000005'" # inputs - OFF #Examples/analysis_default_restart.py # analysis + "inputs_test_2d_runtime_components_picmi.py amr.restart='../test_2d_runtime_components_picmi/diags/chk000005'" # inputs + OFF #analysis_default_restart.py # analysis OFF #diags/diag1000010 # output test_2d_runtime_components_picmi # dependency ) @@ -45,8 +45,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_acceleration # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -56,8 +56,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_3d_acceleration_restart # inputs + analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration # dependency ) @@ -68,8 +68,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration_psatd # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_acceleration_psatd # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -81,8 +81,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration_psatd_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_3d_acceleration_psatd_restart # inputs + analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration_psatd # dependency ) @@ -94,8 +94,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_acceleration_psatd_time_avg # inputs + analysis_default_regression.py # analysis diags/diag1000010 # output OFF # dependency ) @@ -107,8 +107,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/restart/inputs_test_3d_acceleration_psatd_time_avg_restart # inputs - Examples/analysis_default_restart.py # analysis + inputs_test_3d_acceleration_psatd_time_avg_restart # inputs + analysis_default_restart.py # analysis diags/diag1000010 # output test_3d_acceleration_psatd_time_avg # dependency ) diff --git a/Examples/Tests/restart/analysis_default_regression.py b/Examples/Tests/restart/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/restart/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/restart/analysis_default_restart.py b/Examples/Tests/restart/analysis_default_restart.py new file mode 120000 index 00000000000..0459986eebc --- /dev/null +++ b/Examples/Tests/restart/analysis_default_restart.py @@ -0,0 +1 @@ +../../analysis_default_restart.py \ No newline at end of file diff --git a/Examples/Tests/restart_eb/CMakeLists.txt b/Examples/Tests/restart_eb/CMakeLists.txt index 37b75d05d46..f3664b7e1c6 100644 --- a/Examples/Tests/restart_eb/CMakeLists.txt +++ b/Examples/Tests/restart_eb/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 3 # dims 1 # nprocs ON # eb - Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_3d_eb_picmi.py # inputs + analysis_default_regression.py # analysis diags/diag1000060 # output OFF # dependency ) @@ -18,8 +18,8 @@ add_warpx_test( # 3 # dims # 1 # nprocs # ON # eb -# "Examples/Tests/restart_eb/inputs_test_3d_eb_picmi.py amr.restart='../test_3d_eb_picmi/diags/chk000030'" # inputs -# Examples/analysis_default_restart.py # analysis +# "inputs_test_3d_eb_picmi.py amr.restart='../test_3d_eb_picmi/diags/chk000030'" # inputs +# analysis_default_restart.py # analysis # diags/diag1000060 # output # test_3d_eb_picmi # dependency #) diff --git a/Examples/Tests/restart_eb/analysis_default_regression.py b/Examples/Tests/restart_eb/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/restart_eb/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/restart_eb/analysis_default_restart.py b/Examples/Tests/restart_eb/analysis_default_restart.py new file mode 120000 index 00000000000..0459986eebc --- /dev/null +++ b/Examples/Tests/restart_eb/analysis_default_restart.py @@ -0,0 +1 @@ +../../analysis_default_restart.py \ No newline at end of file diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index 9e901d67397..4fdef6a248b 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_btd # inputs - Examples/Tests/rigid_injection/analysis_rigid_injection_btd.py # analysis + inputs_test_2d_rigid_injection_btd # inputs + analysis_rigid_injection_btd.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/rigid_injection/inputs_test_2d_rigid_injection_lab # inputs - Examples/Tests/rigid_injection/analysis_rigid_injection_lab.py # analysis + inputs_test_2d_rigid_injection_lab # inputs + analysis_rigid_injection_lab.py # analysis diags/diag1000289 # output OFF # dependency ) diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index 30513572b0d..9a936949a74 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/scraping/inputs_test_rz_scraping # inputs - Examples/Tests/scraping/analysis_rz.py # analysis + inputs_test_rz_scraping # inputs + analysis_rz.py # analysis diags/diag1000037 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_EB) RZ # dims 2 # nprocs ON # eb - Examples/Tests/scraping/inputs_test_rz_scraping_filter # inputs - Examples/Tests/scraping/analysis_rz_filter.py # analysis + inputs_test_rz_scraping_filter # inputs + analysis_rz_filter.py # analysis diags/diag1000037 # output OFF # dependency ) diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index 9894dbf01d5..a9058c37f85 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 1 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_test_1d_silver_mueller # inputs - Examples/Tests/silver_mueller/analysis.py # analysis + inputs_test_1d_silver_mueller # inputs + analysis.py # analysis diags/diag1000500 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_x # inputs - Examples/Tests/silver_mueller/analysis.py # analysis + inputs_test_2d_silver_mueller_x # inputs + analysis.py # analysis diags/diag1000500 # output OFF # dependency ) @@ -28,8 +28,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_test_2d_silver_mueller_z # inputs - Examples/Tests/silver_mueller/analysis.py # analysis + inputs_test_2d_silver_mueller_z # inputs + analysis.py # analysis diags/diag1000500 # output OFF # dependency ) @@ -39,8 +39,8 @@ add_warpx_test( RZ # dims 2 # nprocs OFF # eb - Examples/Tests/silver_mueller/inputs_test_rz_silver_mueller_z # inputs - Examples/Tests/silver_mueller/analysis.py # analysis + inputs_test_rz_silver_mueller_z # inputs + analysis.py # analysis diags/diag1000500 # output OFF # dependency ) diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 95aac7c42ee..38a9ccca3ce 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/single_particle/inputs_test_2d_bilinear_filter # inputs - Examples/Tests/single_particle/analysis.py # analysis + inputs_test_2d_bilinear_filter # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index 30115fdc33e..3d66074e70e 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/space_charge_initialization/inputs_test_2d_space_charge_initialization # inputs - Examples/Tests/space_charge_initialization/analysis.py # analysis + inputs_test_2d_space_charge_initialization # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) @@ -17,8 +17,8 @@ add_warpx_test( 3 # dims 2 # nprocs OFF # eb - Examples/Tests/space_charge_initialization/inputs_test_3d_space_charge_initialization # inputs - Examples/Tests/space_charge_initialization/analysis.py # analysis + inputs_test_3d_space_charge_initialization # inputs + analysis.py # analysis diags/diag1000001 # output OFF # dependency ) diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index 3eb6b189ac6..f772cbee117 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -6,8 +6,8 @@ add_warpx_test( 2 # dims 2 # nprocs OFF # eb - Examples/Tests/subcycling/inputs_test_2d_subcycling_mr # inputs - Examples/analysis_default_regression.py # analysis + inputs_test_2d_subcycling_mr # inputs + analysis_default_regression.py # analysis diags/diag1000250 # output OFF # dependency ) diff --git a/Examples/Tests/subcycling/analysis_default_regression.py b/Examples/Tests/subcycling/analysis_default_regression.py new file mode 120000 index 00000000000..d8ce3fca419 --- /dev/null +++ b/Examples/Tests/subcycling/analysis_default_regression.py @@ -0,0 +1 @@ +../../analysis_default_regression.py \ No newline at end of file diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index b39ea38953d..e181820faa6 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -7,8 +7,8 @@ if(WarpX_FFT) 2 # dims 2 # nprocs OFF # eb - Examples/Tests/vay_deposition/inputs_test_2d_vay_deposition # inputs - Examples/Tests/vay_deposition/analysis.py # analysis + inputs_test_2d_vay_deposition # inputs + analysis.py # analysis diags/diag1000050 # output OFF # dependency ) @@ -20,8 +20,8 @@ if(WarpX_FFT) 3 # dims 2 # nprocs OFF # eb - Examples/Tests/vay_deposition/inputs_test_3d_vay_deposition # inputs - Examples/Tests/vay_deposition/analysis.py # analysis + inputs_test_3d_vay_deposition # inputs + analysis.py # analysis diags/diag1000025 # output OFF # dependency ) From 8e64870fe4fe42fd6c88f69741fe7761d30226c6 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 4 Sep 2024 17:17:53 -0700 Subject: [PATCH 161/167] Update docs --- Docs/source/developers/testing.rst | 76 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/Docs/source/developers/testing.rst b/Docs/source/developers/testing.rst index ac6bca2c6e2..54ec7a4540a 100644 --- a/Docs/source/developers/testing.rst +++ b/Docs/source/developers/testing.rst @@ -97,64 +97,64 @@ A new test can be added by adding a corresponding entry in ``CMakeLists.txt`` as * Add the **regular test** ``test_1d_laser_acceleration``: - .. code-block:: sh + .. code-block:: cmake add_warpx_test( - test_1d_laser_acceleration # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_acceleration # inputs - analysis.py # analysis - diags/diag1000100 # output (plotfile) - OFF # dependency + test_1d_laser_acceleration # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_acceleration # inputs + analysis.py # analysis + diags/diag1000100 # output (plotfile) + OFF # dependency ) * Add the **PICMI test** ``test_2d_laser_acceleration_picmi``: - .. code-block:: sh + .. code-block:: cmake add_warpx_test( - test_2d_laser_acceleration_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_acceleration_picmi.py # inputs - analysis.py # analysis - diags/diag1000100 # output (plotfile) - OFF # dependency + test_2d_laser_acceleration_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_acceleration_picmi.py # inputs + analysis.py # analysis + diags/diag1000100 # output (plotfile) + OFF # dependency ) * Add the **restart test** ``test_3d_laser_acceleration_restart``: - .. code-block:: sh + .. code-block:: cmake add_warpx_test( - test_3d_laser_acceleration_restart # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_acceleration_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000100 # output (plotfile) - test_3d_laser_acceleration # dependency + test_3d_laser_acceleration_restart # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_laser_acceleration_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000100 # output (plotfile) + test_3d_laser_acceleration # dependency ) Note that the restart has an explicit dependency, namely it can run only provided that the original test, from which the restart checkpoint files will be read, runs first. * A more complex example. Add the **PICMI test** ``test_rz_laser_acceleration_picmi``, with custom command-line arguments ``--test`` and ``dir``, and openPMD time series output: - .. code-block:: sh + .. code-block:: cmake add_warpx_test( - test_rz_laser_acceleration_picmi # name - RZ # dims - 2 # nprocs - OFF # eb - "inputs_test_rz_laser_acceleration_picmi.py --test --dir 1" # inputs - analysis.py # analysis - diags/diag1/ # output (openPMD time series) - OFF # dependency + test_rz_laser_acceleration_picmi # name + RZ # dims + 2 # nprocs + OFF # eb + "inputs_test_rz_laser_acceleration_picmi.py --test --dir 1" # inputs + analysis.py # analysis + diags/diag1/ # output (openPMD time series) + OFF # dependency ) If you need a new Python package dependency for testing, please add it in `Regression/requirements.txt `__. @@ -164,7 +164,7 @@ Sometimes, two tests share a large number of input parameters. The shared input Naming conventions for automated tests -------------------------------------- -Note that we currently obey the following snake\_case naming conventions for test names and test input files (which make automation tasks easier, e.g., parsing visually, parsing through code, sorting alphabetically, filtering tests in CTest via -R, etc.): +Note that we currently obey the following snake\_case naming conventions for test names and test input files (which make automation tasks easier, e.g., parsing visually, parsing through code, sorting alphabetically, filtering tests in CTest via ``-R``, etc.): #. **Regular test names** start with the string ``test_1d_``, ``test_2d_``, ``test_3d_`` or ``test_rz_``, followed by a string that is descriptive of the test. For example, ``test_3d_laser_acceleration``. @@ -174,6 +174,8 @@ Note that we currently obey the following snake\_case naming conventions for tes #. **Test input files** start with the string ``inputs_`` followed by the test name. For example, ``inputs_test_3d_laser_acceleration`` or ``inputs_test_3d_laser_acceleration_picmi.py`` or ``inputs_test_3d_laser_acceleration_restart``. +#. **Base input files** (that is, files collecting input parameters shared between two or more tests) are typically named ``inputs_base_1d``, ``inputs_base_2d``, ``inputs_base_3d`` or ``inputs_base_rz``, possibly followed by additional strings if need be. + Useful tool for plotfile comparison: ``fcompare`` ------------------------------------------------- From 8c62ca28b9ceabba260c342cf50d34b4fc0bee3b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Wed, 4 Sep 2024 22:08:10 -0700 Subject: [PATCH 162/167] Fix temporary build command in Azure pipeline --- .azure-pipelines.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4df23422a5c..f6117138bad 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -147,10 +147,12 @@ jobs: df -h # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" + # FIXME update after https://github.com/AMReX-Codes/amrex/pull/4126 cmake -S . -B build \ ${AMReX_CMAKE_FLAGS} \ ${WARPX_CMAKE_FLAGS} \ - -DWarpX_amrex_repo=https://github.com/ax3l/amrex.git -DWarpX_amrex_branch=topic-pp-prefix \ # FIXME remove line + -DWarpX_amrex_repo=https://github.com/ax3l/amrex.git \ + -DWarpX_amrex_branch=topic-pp-prefix \ -DWarpX_TEST_CLEANUP=ON \ -DWarpX_TEST_FPETRAP=ON # build From 013ddd640f991190b8283bed9d0e3abf1751f64e Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 5 Sep 2024 08:54:16 -0700 Subject: [PATCH 163/167] Split steps for build and test in Azure pipeline --- .azure-pipelines.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index f6117138bad..58b7549e5e8 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -145,6 +145,7 @@ jobs: - bash: | set -eu -o pipefail df -h + # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" # FIXME update after https://github.com/AMReX-Codes/amrex/pull/4126 @@ -155,10 +156,15 @@ jobs: -DWarpX_amrex_branch=topic-pp-prefix \ -DWarpX_TEST_CLEANUP=ON \ -DWarpX_TEST_FPETRAP=ON + # build cmake --build build -j 2 + df -h + displayName: 'Build' + + - bash: | + set -eu -o pipefail + # run tests (exclude pytest.AMReX when running Python tests) ctest --test-dir build --output-on-failure -E AMReX - rm -rf build - df -h - displayName: 'Build & test' + displayName: 'Test' From cb5e42cf8e2102a3040dea7032404911fe17ef5b Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 5 Sep 2024 09:09:51 -0700 Subject: [PATCH 164/167] Fix indentation in docs --- Docs/source/developers/testing.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Docs/source/developers/testing.rst b/Docs/source/developers/testing.rst index 54ec7a4540a..fd57b61fa17 100644 --- a/Docs/source/developers/testing.rst +++ b/Docs/source/developers/testing.rst @@ -43,43 +43,43 @@ For easier debugging, it can be convenient to run the tests on your local machin .. code-block:: sh - ctest --test-dir build -N + ctest --test-dir build -N * Run tests available for the current build options: .. code-block:: sh - ctest --test-dir build + ctest --test-dir build * Run tests available for the current build options in parallel (while preserving existing dependencies between tests): .. code-block:: sh - ctest --test-dir build -j 2 + ctest --test-dir build -j 2 * Run tests available for the current build options and output anything outputted by the test program if the test should fail: .. code-block:: sh - ctest --test-dir build --output-on-failure + ctest --test-dir build --output-on-failure * Run tests available for the current build options with verbose output: .. code-block:: sh - ctest --test-dir build --verbose + ctest --test-dir build --verbose * Run tests matching the regular expression ``laser_acceleration``: .. code-block:: sh - ctest --test-dir build -R laser_acceleration + ctest --test-dir build -R laser_acceleration * Run tests except those matching the regular expression ``laser_acceleration``: .. code-block:: sh - ctest --test-dir build -E laser_acceleration + ctest --test-dir build -E laser_acceleration Once the execution of CTest is completed, you can find all files associated with each test in its corresponding directory under ``build/bin/``. For example, if you run the single test ``test_3d_laser_acceleration``, you can find all files associated with this test in the directory ``build/bin/test_3d_laser_acceleration/``. From 2c7a134cb46c50b6aa491b852150a8d322b83a33 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 5 Sep 2024 09:16:04 -0700 Subject: [PATCH 165/167] Style fixes in CMakeLists.txt files --- .../beam_beam_collision/CMakeLists.txt | 16 +- .../capacitive_discharge/CMakeLists.txt | 86 +-- .../laser_acceleration/CMakeLists.txt | 218 +++---- .../laser_ion/CMakeLists.txt | 32 +- .../plasma_acceleration/CMakeLists.txt | 128 ++-- .../plasma_mirror/CMakeLists.txt | 16 +- .../spacecraft_charging/CMakeLists.txt | 14 +- .../uniform_plasma/CMakeLists.txt | 48 +- Examples/Tests/CMakeLists.txt | 2 +- .../Tests/accelerator_lattice/CMakeLists.txt | 48 +- Examples/Tests/boosted_diags/CMakeLists.txt | 16 +- Examples/Tests/boundaries/CMakeLists.txt | 16 +- Examples/Tests/btd_rz/CMakeLists.txt | 14 +- .../collider_relevant_diags/CMakeLists.txt | 16 +- Examples/Tests/collision/CMakeLists.txt | 94 +-- Examples/Tests/diff_lumi_diag/CMakeLists.txt | 16 +- Examples/Tests/divb_cleaning/CMakeLists.txt | 16 +- Examples/Tests/dive_cleaning/CMakeLists.txt | 32 +- .../electrostatic_dirichlet_bc/CMakeLists.txt | 32 +- .../Tests/electrostatic_sphere/CMakeLists.txt | 78 +-- .../electrostatic_sphere_eb/CMakeLists.txt | 76 +-- .../embedded_boundary_cube/CMakeLists.txt | 48 +- .../CMakeLists.txt | 14 +- .../CMakeLists.txt | 16 +- .../CMakeLists.txt | 32 +- Examples/Tests/embedded_circle/CMakeLists.txt | 14 +- .../CMakeLists.txt | 16 +- Examples/Tests/field_probe/CMakeLists.txt | 16 +- Examples/Tests/flux_injection/CMakeLists.txt | 30 +- Examples/Tests/gaussian_beam/CMakeLists.txt | 32 +- Examples/Tests/implicit/CMakeLists.txt | 64 +- .../Tests/initial_distribution/CMakeLists.txt | 16 +- .../initial_plasma_profile/CMakeLists.txt | 16 +- Examples/Tests/ion_stopping/CMakeLists.txt | 16 +- Examples/Tests/ionization/CMakeLists.txt | 48 +- Examples/Tests/langmuir/CMakeLists.txt | 550 +++++++++--------- Examples/Tests/langmuir_fluids/CMakeLists.txt | 62 +- Examples/Tests/larmor/CMakeLists.txt | 16 +- Examples/Tests/laser_injection/CMakeLists.txt | 48 +- .../laser_injection_from_file/CMakeLists.txt | 216 +++---- Examples/Tests/laser_on_fine/CMakeLists.txt | 16 +- .../Tests/load_external_field/CMakeLists.txt | 88 +-- .../Tests/magnetostatic_eb/CMakeLists.txt | 48 +- .../Tests/maxwell_hybrid_qed/CMakeLists.txt | 16 +- .../Tests/nci_fdtd_stability/CMakeLists.txt | 32 +- .../Tests/nci_psatd_stability/CMakeLists.txt | 272 ++++----- .../Tests/nodal_electrostatic/CMakeLists.txt | 16 +- Examples/Tests/nuclear_fusion/CMakeLists.txt | 94 +-- .../Tests/ohm_solver_em_modes/CMakeLists.txt | 30 +- .../CMakeLists.txt | 16 +- .../CMakeLists.txt | 16 +- .../CMakeLists.txt | 16 +- .../open_bc_poisson_solver/CMakeLists.txt | 16 +- .../CMakeLists.txt | 14 +- .../particle_boundary_process/CMakeLists.txt | 38 +- .../particle_boundary_scrape/CMakeLists.txt | 32 +- .../Tests/particle_data_python/CMakeLists.txt | 48 +- .../particle_fields_diags/CMakeLists.txt | 32 +- Examples/Tests/particle_pusher/CMakeLists.txt | 16 +- .../particle_thermal_boundary/CMakeLists.txt | 16 +- .../Tests/particles_in_pml/CMakeLists.txt | 64 +- .../pass_mpi_communicator/CMakeLists.txt | 16 +- Examples/Tests/pec/CMakeLists.txt | 48 +- Examples/Tests/photon_pusher/CMakeLists.txt | 16 +- Examples/Tests/plasma_lens/CMakeLists.txt | 80 +-- Examples/Tests/pml/CMakeLists.txt | 150 ++--- .../Tests/point_of_contact_eb/CMakeLists.txt | 30 +- .../projection_divb_cleaner/CMakeLists.txt | 46 +- Examples/Tests/python_wrappers/CMakeLists.txt | 16 +- Examples/Tests/qed/CMakeLists.txt | 160 ++--- .../Tests/radiation_reaction/CMakeLists.txt | 16 +- Examples/Tests/reduced_diags/CMakeLists.txt | 80 +-- .../CMakeLists.txt | 16 +- .../Tests/repelling_particles/CMakeLists.txt | 16 +- Examples/Tests/resampling/CMakeLists.txt | 48 +- Examples/Tests/restart/CMakeLists.txt | 144 ++--- Examples/Tests/restart_eb/CMakeLists.txt | 44 +- Examples/Tests/rigid_injection/CMakeLists.txt | 32 +- Examples/Tests/scraping/CMakeLists.txt | 28 +- Examples/Tests/silver_mueller/CMakeLists.txt | 62 +- Examples/Tests/single_particle/CMakeLists.txt | 16 +- .../CMakeLists.txt | 32 +- Examples/Tests/subcycling/CMakeLists.txt | 16 +- Examples/Tests/vay_deposition/CMakeLists.txt | 32 +- 84 files changed, 2187 insertions(+), 2177 deletions(-) diff --git a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt index 0ade9d64259..793675efaba 100644 --- a/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt +++ b/Examples/Physics_applications/beam_beam_collision/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_beam_beam_collision # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_beam_beam_collision # inputs - analysis_default_openpmd_regression.py # analysis - diags/diag1/ # output - OFF # dependency + test_3d_beam_beam_collision # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_beam_beam_collision # inputs + analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output + OFF # dependency ) diff --git a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt index f11b7010aaf..4f67131556e 100644 --- a/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt +++ b/Examples/Physics_applications/capacitive_discharge/CMakeLists.txt @@ -2,57 +2,57 @@ # add_warpx_test( - test_1d_background_mcc_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - "inputs_base_1d_picmi.py --test --pythonsolver" # inputs - analysis_1d.py # analysis - diags/diag1000050 # output - OFF # dependency + test_1d_background_mcc_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + "inputs_base_1d_picmi.py --test --pythonsolver" # inputs + analysis_1d.py # analysis + diags/diag1000050 # output + OFF # dependency ) add_warpx_test( - test_2d_background_mcc # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_background_mcc # inputs - analysis_default_regression.py # analysis - diags/diag1000050 # output - OFF # dependency + test_1d_dsmc_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + "inputs_base_1d_picmi.py --test --dsmc" # inputs + analysis_dsmc.py # analysis + diags/diag1000050 # output + OFF # dependency +) + +add_warpx_test( + test_2d_background_mcc # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_background_mcc # inputs + analysis_default_regression.py # analysis + diags/diag1000050 # output + OFF # dependency ) # FIXME: can we make this a single precision for now? #add_warpx_test( -# test_2d_background_mcc_dp_psp # name -# 2 # dims -# 2 # nprocs -# OFF # eb -# inputs_test_2d_background_mcc_dp_psp # inputs -# analysis_default_regression.py # analysis -# diags/diag1000050 # output -# OFF # dependency +# test_2d_background_mcc_dp_psp # name +# 2 # dims +# 2 # nprocs +# OFF # eb +# inputs_test_2d_background_mcc_dp_psp # inputs +# analysis_default_regression.py # analysis +# diags/diag1000050 # output +# OFF # dependency #) add_warpx_test( - test_2d_background_mcc_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_background_mcc_picmi.py # inputs - analysis_2d.py # analysis - diags/diag1000050 # output - OFF # dependency -) - -add_warpx_test( - test_1d_dsmc_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - "inputs_base_1d_picmi.py --test --dsmc" # inputs - analysis_dsmc.py # analysis - diags/diag1000050 # output - OFF # dependency + test_2d_background_mcc_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_background_mcc_picmi.py # inputs + analysis_2d.py # analysis + diags/diag1000050 # output + OFF # dependency ) diff --git a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt index 1c808f5fc41..9f4a5f1dc58 100644 --- a/Examples/Physics_applications/laser_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/laser_acceleration/CMakeLists.txt @@ -2,155 +2,155 @@ # add_warpx_test( - test_1d_laser_acceleration # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_acceleration # inputs - analysis_default_regression.py # analysis - diags/diag1000100 # output - OFF # dependency + test_1d_laser_acceleration # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_acceleration # inputs + analysis_default_regression.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_1d_laser_acceleration_fluid # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_acceleration_fluid # inputs - analysis_1d_fluid.py # analysis - diags/diag1040000 # output - OFF # dependency + test_1d_laser_acceleration_fluid # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_acceleration_fluid # inputs + analysis_1d_fluid.py # analysis + diags/diag1040000 # output + OFF # dependency ) add_warpx_test( - test_1d_laser_acceleration_fluid_boosted # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_acceleration_fluid_boosted # inputs - analysis_1d_fluid_boosted.py # analysis - diags/diag1000001 # output - OFF # dependency + test_1d_laser_acceleration_fluid_boosted # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_acceleration_fluid_boosted # inputs + analysis_1d_fluid_boosted.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_1d_laser_acceleration_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_acceleration_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000100 # output - OFF # dependency + test_1d_laser_acceleration_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_2d_laser_acceleration_boosted # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_acceleration_boosted # inputs - analysis_default_regression.py # analysis - diags/diag1000002 # output - OFF # dependency + test_2d_laser_acceleration_boosted # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_acceleration_boosted # inputs + analysis_default_regression.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_2d_laser_acceleration_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_acceleration_mr # inputs - analysis_default_regression.py # analysis - diags/diag1000200 # output - OFF # dependency + test_2d_laser_acceleration_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_acceleration_mr # inputs + analysis_default_regression.py # analysis + diags/diag1000200 # output + OFF # dependency ) add_warpx_test( - test_2d_laser_acceleration_mr_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_acceleration_mr_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000200 # output - OFF # dependency + test_2d_laser_acceleration_mr_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_acceleration_mr_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000200 # output + OFF # dependency ) add_warpx_test( - test_3d_laser_acceleration # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_acceleration # inputs - analysis_default_openpmd_regression.py # analysis - diags/diag1/ # output - OFF # dependency + test_2d_refined_injection # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_refined_injection # inputs + analysis_refined_injection.py # analysis + diags/diag1000200 # output + OFF # dependency ) add_warpx_test( - test_3d_laser_acceleration_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_acceleration_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000100 # output - OFF # dependency + test_3d_laser_acceleration # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_laser_acceleration # inputs + analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_3d_laser_acceleration_single_precision_comms # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_acceleration_single_precision_comms # inputs - analysis_default_openpmd_regression.py # analysis - diags/diag1/ # output - OFF # dependency + test_3d_laser_acceleration_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_rz_laser_acceleration # name - RZ # dims + test_3d_laser_acceleration_single_precision_comms # name + 3 # dims 2 # nprocs - OFF # eb - inputs_test_rz_laser_acceleration # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + OFF # eb + inputs_test_3d_laser_acceleration_single_precision_comms # inputs + analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_rz_laser_acceleration_opmd # name - RZ # dims + test_rz_laser_acceleration # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_laser_acceleration_opmd # inputs - analysis_openpmd_rz.py # analysis - diags/diag1/ # output - OFF # dependency + OFF # eb + inputs_test_rz_laser_acceleration # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_rz_laser_acceleration_picmi # name - RZ # dims + test_rz_laser_acceleration_opmd # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_laser_acceleration_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + OFF # eb + inputs_test_rz_laser_acceleration_opmd # inputs + analysis_openpmd_rz.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_2d_refined_injection # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_refined_injection # inputs - analysis_refined_injection.py # analysis - diags/diag1000200 # output - OFF # dependency + test_rz_laser_acceleration_picmi # name + RZ # dims + 2 # nprocs + OFF # eb + inputs_test_rz_laser_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Physics_applications/laser_ion/CMakeLists.txt b/Examples/Physics_applications/laser_ion/CMakeLists.txt index 615ff8a2b49..ba51e4d1398 100644 --- a/Examples/Physics_applications/laser_ion/CMakeLists.txt +++ b/Examples/Physics_applications/laser_ion/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_laser_ion_acc # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_ion_acc # inputs - analysis_default_openpmd_regression.py # analysis - diags/diag1/ # output - OFF # dependency + test_2d_laser_ion_acc # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_ion_acc # inputs + analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_2d_laser_ion_acc_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_ion_acc_picmi.py # inputs - analysis_default_openpmd_regression.py # analysis - diags/diag1/ # output - OFF # dependency + test_2d_laser_ion_acc_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_ion_acc_picmi.py # inputs + analysis_default_openpmd_regression.py # analysis + diags/diag1/ # output + OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt index f856728a46d..ec3e4b09563 100644 --- a/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_acceleration/CMakeLists.txt @@ -2,89 +2,89 @@ # add_warpx_test( - test_1d_plasma_acceleration_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_plasma_acceleration_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1001000 # output - OFF # dependency + test_1d_plasma_acceleration_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_plasma_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1001000 # output + OFF # dependency ) add_warpx_test( - test_2d_plasma_acceleration_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_plasma_acceleration_mr # inputs - analysis_default_regression.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_plasma_acceleration_boosted # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_plasma_acceleration_boosted # inputs + analysis_default_regression.py # analysis + diags/diag1000020 # output + OFF # dependency ) add_warpx_test( - test_2d_plasma_acceleration_mr_momentum_conserving # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs - analysis_default_regression.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_plasma_acceleration_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_plasma_acceleration_mr # inputs + analysis_default_regression.py # analysis + diags/diag1000400 # output + OFF # dependency ) add_warpx_test( - test_2d_plasma_acceleration_boosted # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_plasma_acceleration_boosted # inputs - analysis_default_regression.py # analysis - diags/diag1000020 # output - OFF # dependency + test_2d_plasma_acceleration_mr_momentum_conserving # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_plasma_acceleration_mr_momentum_conserving # inputs + analysis_default_regression.py # analysis + diags/diag1000400 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_acceleration_boosted # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_acceleration_boosted # inputs - analysis_default_regression.py # analysis - diags/diag1000005 # output - OFF # dependency + test_3d_plasma_acceleration_boosted # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_acceleration_boosted # inputs + analysis_default_regression.py # analysis + diags/diag1000005 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_acceleration_boosted_hybrid # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs - analysis_default_regression.py # analysis - diags/diag1000025 # output - OFF # dependency + test_3d_plasma_acceleration_boosted_hybrid # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_acceleration_boosted_hybrid # inputs + analysis_default_regression.py # analysis + diags/diag1000025 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_acceleration_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_acceleration_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_plasma_acceleration_mr_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_acceleration_mr_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_acceleration_mr_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_plasma_acceleration_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_acceleration_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt index f880cadbdb1..b90e775a4b5 100644 --- a/Examples/Physics_applications/plasma_mirror/CMakeLists.txt +++ b/Examples/Physics_applications/plasma_mirror/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_plasma_mirror # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_plasma_mirror # inputs - analysis_default_regression.py # analysis - diags/diag1000020 # output - OFF # dependency + test_2d_plasma_mirror # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_plasma_mirror # inputs + analysis_default_regression.py # analysis + diags/diag1000020 # output + OFF # dependency ) diff --git a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt index 4ab274e9cd7..181304e9193 100644 --- a/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt +++ b/Examples/Physics_applications/spacecraft_charging/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_rz_spacecraft_charging_picmi # name - RZ # dims + test_rz_spacecraft_charging_picmi # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_spacecraft_charging_picmi.py # inputs - analysis.py # analysis - diags/diag1/ # output - OFF # dependency + ON # eb + inputs_test_rz_spacecraft_charging_picmi.py # inputs + analysis.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() diff --git a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt index 2462ce03f92..f654dc79063 100644 --- a/Examples/Physics_applications/uniform_plasma/CMakeLists.txt +++ b/Examples/Physics_applications/uniform_plasma/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_2d_uniform_plasma # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_uniform_plasma # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_uniform_plasma # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_uniform_plasma # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_3d_uniform_plasma # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_uniform_plasma # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_uniform_plasma # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_uniform_plasma # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_3d_uniform_plasma_restart # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_uniform_plasma_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000010 # output - test_3d_uniform_plasma # dependency + test_3d_uniform_plasma_restart # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_uniform_plasma_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000010 # output + test_3d_uniform_plasma # dependency ) diff --git a/Examples/Tests/CMakeLists.txt b/Examples/Tests/CMakeLists.txt index 60cd61aec9a..108a28a6539 100644 --- a/Examples/Tests/CMakeLists.txt +++ b/Examples/Tests/CMakeLists.txt @@ -36,10 +36,10 @@ add_subdirectory(laser_on_fine) add_subdirectory(load_external_field) add_subdirectory(magnetostatic_eb) add_subdirectory(maxwell_hybrid_qed) -add_subdirectory(nuclear_fusion) add_subdirectory(nci_fdtd_stability) add_subdirectory(nci_psatd_stability) add_subdirectory(nodal_electrostatic) +add_subdirectory(nuclear_fusion) add_subdirectory(ohm_solver_em_modes) add_subdirectory(ohm_solver_ion_beam_instability) add_subdirectory(ohm_solver_ion_Landau_damping) diff --git a/Examples/Tests/accelerator_lattice/CMakeLists.txt b/Examples/Tests/accelerator_lattice/CMakeLists.txt index 55720b21904..7fc6b4dc8e4 100644 --- a/Examples/Tests/accelerator_lattice/CMakeLists.txt +++ b/Examples/Tests/accelerator_lattice/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_3d_hard_edged_quadrupoles # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_hard_edged_quadrupoles # inputs - analysis.py # analysis - diags/diag1000050 # output - OFF # dependency + test_3d_hard_edged_quadrupoles # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_hard_edged_quadrupoles # inputs + analysis.py # analysis + diags/diag1000050 # output + OFF # dependency ) add_warpx_test( - test_3d_hard_edged_quadrupoles_boosted # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_hard_edged_quadrupoles_boosted # inputs - analysis.py # analysis - diags/diag1000050 # output - OFF # dependency + test_3d_hard_edged_quadrupoles_boosted # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_hard_edged_quadrupoles_boosted # inputs + analysis.py # analysis + diags/diag1000050 # output + OFF # dependency ) add_warpx_test( - test_3d_hard_edged_quadrupoles_moving # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_hard_edged_quadrupoles_moving # inputs - analysis.py # analysis - diags/diag1000050 # output - OFF # dependency + test_3d_hard_edged_quadrupoles_moving # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_hard_edged_quadrupoles_moving # inputs + analysis.py # analysis + diags/diag1000050 # output + OFF # dependency ) diff --git a/Examples/Tests/boosted_diags/CMakeLists.txt b/Examples/Tests/boosted_diags/CMakeLists.txt index 1c6f200a238..f0a6ceaf397 100644 --- a/Examples/Tests/boosted_diags/CMakeLists.txt +++ b/Examples/Tests/boosted_diags/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_laser_acceleration_btd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_acceleration_btd # inputs - analysis.py # analysis - diags/diag1000003 # output - OFF # dependency + test_3d_laser_acceleration_btd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_laser_acceleration_btd # inputs + analysis.py # analysis + diags/diag1000003 # output + OFF # dependency ) diff --git a/Examples/Tests/boundaries/CMakeLists.txt b/Examples/Tests/boundaries/CMakeLists.txt index c653d778d77..928b4b95071 100644 --- a/Examples/Tests/boundaries/CMakeLists.txt +++ b/Examples/Tests/boundaries/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_particle_boundaries # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_particle_boundaries # inputs - analysis.py # analysis - diags/diag1000008 # output - OFF # dependency + test_3d_particle_boundaries # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_particle_boundaries # inputs + analysis.py # analysis + diags/diag1000008 # output + OFF # dependency ) diff --git a/Examples/Tests/btd_rz/CMakeLists.txt b/Examples/Tests/btd_rz/CMakeLists.txt index e79d5067ffe..15a01eb1680 100644 --- a/Examples/Tests/btd_rz/CMakeLists.txt +++ b/Examples/Tests/btd_rz/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_rz_btd # name - RZ # dims + test_rz_btd # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_btd # inputs - analysis.py # analysis - diags/diag1000289 # output - OFF # dependency + OFF # eb + inputs_test_rz_btd # inputs + analysis.py # analysis + diags/diag1000289 # output + OFF # dependency ) diff --git a/Examples/Tests/collider_relevant_diags/CMakeLists.txt b/Examples/Tests/collider_relevant_diags/CMakeLists.txt index cb66ed5caa2..ad999477507 100644 --- a/Examples/Tests/collider_relevant_diags/CMakeLists.txt +++ b/Examples/Tests/collider_relevant_diags/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_collider_diagnostics # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_collider_diagnostics # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_collider_diagnostics # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_collider_diagnostics # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/collision/CMakeLists.txt b/Examples/Tests/collision/CMakeLists.txt index 5198a1104e8..4293ba248e7 100644 --- a/Examples/Tests/collision/CMakeLists.txt +++ b/Examples/Tests/collision/CMakeLists.txt @@ -2,67 +2,67 @@ # add_warpx_test( - test_1d_collision_z # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_collision_z # inputs - analysis_collision_1d.py # analysis - diags/diag1000600 # output - OFF # dependency + test_1d_collision_z # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_collision_z # inputs + analysis_collision_1d.py # analysis + diags/diag1000600 # output + OFF # dependency ) add_warpx_test( - test_3d_collision_iso # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_collision_iso # inputs - analysis_collision_3d_isotropization.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_collision_xz # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_collision_xz # inputs + analysis_collision_2d.py # analysis + diags/diag1000150 # output + OFF # dependency ) add_warpx_test( - test_rz_collision # name - RZ # dims + test_2d_collision_xz_picmi # name + 2 # dims 1 # nprocs - OFF # eb - inputs_test_rz_collision # inputs - analysis_collision_rz.py # analysis - diags/diag1000150 # output - OFF # dependency + OFF # eb + inputs_test_2d_collision_xz_picmi.py # inputs + analysis_collision_2d.py # analysis + diags/diag1000150 # output + OFF # dependency ) add_warpx_test( - test_3d_collision_xyz # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_collision_xyz # inputs - analysis_collision_3d.py # analysis - diags/diag1000150 # output - OFF # dependency + test_3d_collision_iso # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_collision_iso # inputs + analysis_collision_3d_isotropization.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_2d_collision_xz # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_collision_xz # inputs - analysis_collision_2d.py # analysis - diags/diag1000150 # output - OFF # dependency + test_3d_collision_xyz # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_collision_xyz # inputs + analysis_collision_3d.py # analysis + diags/diag1000150 # output + OFF # dependency ) add_warpx_test( - test_2d_collision_xz_picmi # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_collision_xz_picmi.py # inputs - analysis_collision_2d.py # analysis - diags/diag1000150 # output - OFF # dependency + test_rz_collision # name + RZ # dims + 1 # nprocs + OFF # eb + inputs_test_rz_collision # inputs + analysis_collision_rz.py # analysis + diags/diag1000150 # output + OFF # dependency ) diff --git a/Examples/Tests/diff_lumi_diag/CMakeLists.txt b/Examples/Tests/diff_lumi_diag/CMakeLists.txt index 38a36f4be5c..2385a758fb6 100644 --- a/Examples/Tests/diff_lumi_diag/CMakeLists.txt +++ b/Examples/Tests/diff_lumi_diag/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_diff_lumi_diag # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_diff_lumi_diag # inputs - analysis.py # analysis - diags/diag1000080 # output - OFF # dependency + test_3d_diff_lumi_diag # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_diff_lumi_diag # inputs + analysis.py # analysis + diags/diag1000080 # output + OFF # dependency ) diff --git a/Examples/Tests/divb_cleaning/CMakeLists.txt b/Examples/Tests/divb_cleaning/CMakeLists.txt index c22729a1386..f0a8162212f 100644 --- a/Examples/Tests/divb_cleaning/CMakeLists.txt +++ b/Examples/Tests/divb_cleaning/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_divb_cleaning # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_divb_cleaning # inputs - analysis.py # analysis - diags/diag1000400 # output - OFF # dependency + test_3d_divb_cleaning # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_divb_cleaning # inputs + analysis.py # analysis + diags/diag1000400 # output + OFF # dependency ) diff --git a/Examples/Tests/dive_cleaning/CMakeLists.txt b/Examples/Tests/dive_cleaning/CMakeLists.txt index a5a13197255..1e72305b673 100644 --- a/Examples/Tests/dive_cleaning/CMakeLists.txt +++ b/Examples/Tests/dive_cleaning/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_dive_cleaning # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_dive_cleaning # inputs - analysis.py # analysis - diags/diag1000128 # output - OFF # dependency + test_2d_dive_cleaning # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_dive_cleaning # inputs + analysis.py # analysis + diags/diag1000128 # output + OFF # dependency ) add_warpx_test( - test_3d_dive_cleaning # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_dive_cleaning # inputs - analysis.py # analysis - diags/diag1000128 # output - OFF # dependency + test_3d_dive_cleaning # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_dive_cleaning # inputs + analysis.py # analysis + diags/diag1000128 # output + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt index b1c44c62246..93e837d4b59 100644 --- a/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt +++ b/Examples/Tests/electrostatic_dirichlet_bc/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_dirichlet_bc # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_dirichlet_bc # inputs - analysis.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_dirichlet_bc # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_dirichlet_bc # inputs + analysis.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_2d_dirichlet_bc_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_dirichlet_bc_picmi.py # inputs - analysis.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_dirichlet_bc_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_dirichlet_bc_picmi.py # inputs + analysis.py # analysis + diags/diag1000100 # output + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere/CMakeLists.txt b/Examples/Tests/electrostatic_sphere/CMakeLists.txt index 8c62e7088cd..e80beb08e97 100644 --- a/Examples/Tests/electrostatic_sphere/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere/CMakeLists.txt @@ -2,56 +2,56 @@ # add_warpx_test( - test_3d_electrostatic_sphere # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_electrostatic_sphere # inputs - analysis_electrostatic_sphere.py # analysis - diags/diag1000030 # output - OFF # dependency + test_3d_electrostatic_sphere # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_electrostatic_sphere # inputs + analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output + OFF # dependency ) add_warpx_test( - test_3d_electrostatic_sphere_lab_frame # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_electrostatic_sphere_lab_frame # inputs - analysis_electrostatic_sphere.py # analysis - diags/diag1000030 # output - OFF # dependency + test_3d_electrostatic_sphere_lab_frame # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_electrostatic_sphere_lab_frame # inputs + analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output + OFF # dependency ) add_warpx_test( - test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs - analysis_electrostatic_sphere.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_electrostatic_sphere_lab_frame_mr_emass_10 # inputs + analysis_electrostatic_sphere.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_3d_electrostatic_sphere_rel_nodal # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_electrostatic_sphere_rel_nodal # inputs - analysis_electrostatic_sphere.py # analysis - diags/diag1000030 # output - OFF # dependency + test_3d_electrostatic_sphere_rel_nodal # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_electrostatic_sphere_rel_nodal # inputs + analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output + OFF # dependency ) add_warpx_test( - test_rz_electrostatic_sphere # name - RZ # dims + test_rz_electrostatic_sphere # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_electrostatic_sphere # inputs - analysis_electrostatic_sphere.py # analysis - diags/diag1000030 # output - OFF # dependency + OFF # eb + inputs_test_rz_electrostatic_sphere # inputs + analysis_electrostatic_sphere.py # analysis + diags/diag1000030 # output + OFF # dependency ) diff --git a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt index 02b473d4cc0..ad5e8974225 100644 --- a/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt +++ b/Examples/Tests/electrostatic_sphere_eb/CMakeLists.txt @@ -3,65 +3,65 @@ if(WarpX_EB) add_warpx_test( - test_3d_electrostatic_sphere_eb # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_electrostatic_sphere_eb # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_electrostatic_sphere_eb # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_electrostatic_sphere_eb # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_electrostatic_sphere_eb_mixed_bc # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs - analysis_default_regression.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_electrostatic_sphere_eb_mixed_bc # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_electrostatic_sphere_eb_mixed_bc # inputs + analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_electrostatic_sphere_eb_picmi # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs - analysis.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_electrostatic_sphere_eb_picmi # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_electrostatic_sphere_eb_picmi.py # inputs + analysis.py # analysis + diags/diag1000002 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_rz_electrostatic_sphere_eb # name - RZ # dims + test_rz_electrostatic_sphere_eb # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_electrostatic_sphere_eb # inputs - analysis_rz.py # analysis - diags/diag1000001 # output - OFF # dependency + ON # eb + inputs_test_rz_electrostatic_sphere_eb # inputs + analysis_rz.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_rz_electrostatic_sphere_eb_mr # name - RZ # dims + test_rz_electrostatic_sphere_eb_mr # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_electrostatic_sphere_eb_mr # inputs - analysis_rz_mr.py # analysis - diags/diag1/ # output - OFF # dependency + ON # eb + inputs_test_rz_electrostatic_sphere_eb_mr # inputs + analysis_rz_mr.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt index fbf83b5fae4..3fd0a0f4c3b 100644 --- a/Examples/Tests/embedded_boundary_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_cube/CMakeLists.txt @@ -3,39 +3,39 @@ if(WarpX_EB) add_warpx_test( - test_2d_embedded_boundary_cube # name - 2 # dims - 1 # nprocs - ON # eb - inputs_test_2d_embedded_boundary_cube # inputs - analysis_fields_2d.py # analysis - diags/diag1000114 # output - OFF # dependency + test_2d_embedded_boundary_cube # name + 2 # dims + 1 # nprocs + ON # eb + inputs_test_2d_embedded_boundary_cube # inputs + analysis_fields_2d.py # analysis + diags/diag1000114 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_embedded_boundary_cube # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_embedded_boundary_cube # inputs - analysis_fields.py # analysis - diags/diag1000208 # output - OFF # dependency + test_3d_embedded_boundary_cube # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_embedded_boundary_cube # inputs + analysis_fields.py # analysis + diags/diag1000208 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_embedded_boundary_cube_macroscopic # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_embedded_boundary_cube_macroscopic # inputs - analysis_fields.py # analysis - diags/diag1000208 # output - OFF # dependency + test_3d_embedded_boundary_cube_macroscopic # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_embedded_boundary_cube_macroscopic # inputs + analysis_fields.py # analysis + diags/diag1000208 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt index 733c35f5e49..d91a94b539b 100644 --- a/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_diffraction/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_rz_embedded_boundary_diffraction # name - RZ # dims + test_rz_embedded_boundary_diffraction # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_embedded_boundary_diffraction # inputs - analysis_fields.py # analysis - diags/diag1/ # output - OFF # dependency + ON # eb + inputs_test_rz_embedded_boundary_diffraction # inputs + analysis_fields.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt index b49ef1973c5..cf45d9d56f3 100644 --- a/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_python_api/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_3d_embedded_boundary_picmi # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_embedded_boundary_picmi.py # inputs - analysis.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_embedded_boundary_picmi # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_embedded_boundary_picmi.py # inputs + analysis.py # analysis + diags/diag1000002 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt index 3203de04039..c9d3b47cece 100644 --- a/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt +++ b/Examples/Tests/embedded_boundary_rotated_cube/CMakeLists.txt @@ -3,26 +3,26 @@ if(WarpX_EB) add_warpx_test( - test_2d_embedded_boundary_rotated_cube # name - 2 # dims - 1 # nprocs - ON # eb - inputs_test_2d_embedded_boundary_rotated_cube # inputs - analysis_fields_2d.py # analysis - diags/diag1000068 # output - OFF # dependency + test_2d_embedded_boundary_rotated_cube # name + 2 # dims + 1 # nprocs + ON # eb + inputs_test_2d_embedded_boundary_rotated_cube # inputs + analysis_fields_2d.py # analysis + diags/diag1000068 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_embedded_boundary_rotated_cube # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_embedded_boundary_rotated_cube # inputs - analysis_fields_3d.py # analysis - diags/diag1000111 # output - OFF # dependency + test_3d_embedded_boundary_rotated_cube # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_embedded_boundary_rotated_cube # inputs + analysis_fields_3d.py # analysis + diags/diag1000111 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/embedded_circle/CMakeLists.txt b/Examples/Tests/embedded_circle/CMakeLists.txt index f9f8a125083..9eb8f23460b 100644 --- a/Examples/Tests/embedded_circle/CMakeLists.txt +++ b/Examples/Tests/embedded_circle/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_2d_embedded_circle # name - 2 # dims - 2 # nprocs - ON # eb - inputs_test_2d_embedded_circle # inputs - analysis.py # analysis + test_2d_embedded_circle # name + 2 # dims + 2 # nprocs + ON # eb + inputs_test_2d_embedded_circle # inputs + analysis.py # analysis diags/diag1000011 - OFF # dependency + OFF # dependency ) endif() diff --git a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt index ea114f82036..13012e7605b 100644 --- a/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt +++ b/Examples/Tests/energy_conserving_thermal_plasma/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_energy_conserving_thermal_plasma # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_energy_conserving_thermal_plasma # inputs - analysis.py # analysis - diags/diag1000500 # output - OFF # dependency + test_2d_energy_conserving_thermal_plasma # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_energy_conserving_thermal_plasma # inputs + analysis.py # analysis + diags/diag1000500 # output + OFF # dependency ) diff --git a/Examples/Tests/field_probe/CMakeLists.txt b/Examples/Tests/field_probe/CMakeLists.txt index 272ee94c718..4ef61237775 100644 --- a/Examples/Tests/field_probe/CMakeLists.txt +++ b/Examples/Tests/field_probe/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_2d_field_probe # name - 2 # dims - 2 # nprocs - ON # eb - inputs_test_2d_field_probe # inputs - analysis.py # analysis - diags/diag1000544 # output - OFF # dependency + test_2d_field_probe # name + 2 # dims + 2 # nprocs + ON # eb + inputs_test_2d_field_probe # inputs + analysis.py # analysis + diags/diag1000544 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/flux_injection/CMakeLists.txt b/Examples/Tests/flux_injection/CMakeLists.txt index a38f943ae52..306ff2018bc 100644 --- a/Examples/Tests/flux_injection/CMakeLists.txt +++ b/Examples/Tests/flux_injection/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_3d_flux_injection # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_flux_injection # inputs - analysis_flux_injection_3d.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_flux_injection # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_flux_injection # inputs + analysis_flux_injection_3d.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_rz_flux_injection # name - RZ # dims + test_rz_flux_injection # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_flux_injection # inputs - analysis_flux_injection_rz.py # analysis - diags/diag1000120 # output - OFF # dependency + OFF # eb + inputs_test_rz_flux_injection # inputs + analysis_flux_injection_rz.py # analysis + diags/diag1000120 # output + OFF # dependency ) diff --git a/Examples/Tests/gaussian_beam/CMakeLists.txt b/Examples/Tests/gaussian_beam/CMakeLists.txt index 4309e515fd3..35ec08c10e3 100644 --- a/Examples/Tests/gaussian_beam/CMakeLists.txt +++ b/Examples/Tests/gaussian_beam/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_3d_focusing_gaussian_beam # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_focusing_gaussian_beam # inputs - analysis.py # analysis - diags/diag1000000 # output - OFF # dependency + test_3d_focusing_gaussian_beam # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_focusing_gaussian_beam # inputs + analysis.py # analysis + diags/diag1000000 # output + OFF # dependency ) add_warpx_test( - test_3d_gaussian_beam_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_gaussian_beam_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_gaussian_beam_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_gaussian_beam_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Tests/implicit/CMakeLists.txt b/Examples/Tests/implicit/CMakeLists.txt index 0a11b8e05b2..11881ae4972 100644 --- a/Examples/Tests/implicit/CMakeLists.txt +++ b/Examples/Tests/implicit/CMakeLists.txt @@ -2,45 +2,45 @@ # add_warpx_test( - test_1d_semi_implicit_picard # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_semi_implicit_picard # inputs - analysis_1d.py # analysis - diags/diag1000100 # output - OFF # dependency + test_1d_semi_implicit_picard # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_semi_implicit_picard # inputs + analysis_1d.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_1d_theta_implicit_picard # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_theta_implicit_picard # inputs - analysis_1d.py # analysis - diags/diag1000100 # output - OFF # dependency + test_1d_theta_implicit_picard # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_theta_implicit_picard # inputs + analysis_1d.py # analysis + diags/diag1000100 # output + OFF # dependency ) add_warpx_test( - test_2d_theta_implicit_jfnk_vandb # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_theta_implicit_jfnk_vandb # inputs - analysis_vandb_jfnk_2d.py # analysis - diags/diag1000020 # output - OFF # dependency + test_2d_theta_implicit_jfnk_vandb # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_theta_implicit_jfnk_vandb # inputs + analysis_vandb_jfnk_2d.py # analysis + diags/diag1000020 # output + OFF # dependency ) add_warpx_test( - test_2d_theta_implicit_jfnk_vandb_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs - analysis_vandb_jfnk_2d.py # analysis - diags/diag1000020 # output - OFF # dependency + test_2d_theta_implicit_jfnk_vandb_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_theta_implicit_jfnk_vandb_picmi.py # inputs + analysis_vandb_jfnk_2d.py # analysis + diags/diag1000020 # output + OFF # dependency ) diff --git a/Examples/Tests/initial_distribution/CMakeLists.txt b/Examples/Tests/initial_distribution/CMakeLists.txt index 5d5ff149f11..14dabd7a67c 100644 --- a/Examples/Tests/initial_distribution/CMakeLists.txt +++ b/Examples/Tests/initial_distribution/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_initial_distribution # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_initial_distribution # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_initial_distribution # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_initial_distribution # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/initial_plasma_profile/CMakeLists.txt b/Examples/Tests/initial_plasma_profile/CMakeLists.txt index 40d81c7e9e2..fab15e8b97f 100644 --- a/Examples/Tests/initial_plasma_profile/CMakeLists.txt +++ b/Examples/Tests/initial_plasma_profile/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_parabolic_channel_initialization # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_parabolic_channel_initialization # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_2d_parabolic_channel_initialization # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_parabolic_channel_initialization # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/ion_stopping/CMakeLists.txt b/Examples/Tests/ion_stopping/CMakeLists.txt index 904421312a7..1f203d76fa1 100644 --- a/Examples/Tests/ion_stopping/CMakeLists.txt +++ b/Examples/Tests/ion_stopping/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_ion_stopping # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_ion_stopping # inputs - analysis.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_ion_stopping # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_ion_stopping # inputs + analysis.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Tests/ionization/CMakeLists.txt b/Examples/Tests/ionization/CMakeLists.txt index b722dd72614..32da653f301 100644 --- a/Examples/Tests/ionization/CMakeLists.txt +++ b/Examples/Tests/ionization/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_2d_ionization_boost # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_ionization_boost # inputs - analysis.py # analysis - diags/diag1000420 # output - OFF # dependency + test_2d_ionization_boost # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_ionization_boost # inputs + analysis.py # analysis + diags/diag1000420 # output + OFF # dependency ) add_warpx_test( - test_2d_ionization_lab # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_ionization_lab # inputs - analysis.py # analysis - diags/diag1001600 # output - OFF # dependency + test_2d_ionization_lab # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_ionization_lab # inputs + analysis.py # analysis + diags/diag1001600 # output + OFF # dependency ) add_warpx_test( - test_2d_ionization_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_ionization_picmi.py # inputs - analysis.py # analysis - diags/diag1001600 # output - OFF # dependency + test_2d_ionization_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_ionization_picmi.py # inputs + analysis.py # analysis + diags/diag1001600 # output + OFF # dependency ) diff --git a/Examples/Tests/langmuir/CMakeLists.txt b/Examples/Tests/langmuir/CMakeLists.txt index 12a02784c57..1223a23e4d2 100644 --- a/Examples/Tests/langmuir/CMakeLists.txt +++ b/Examples/Tests/langmuir/CMakeLists.txt @@ -2,434 +2,434 @@ # add_warpx_test( - test_1d_langmuir_multi # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_langmuir_multi # inputs - analysis_1d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_1d_langmuir_multi # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_langmuir_multi # inputs + analysis_1d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_2d_langmuir_multi_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_mr # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_mr # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_2d_langmuir_multi_mr_anisotropic # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_mr_anisotropic # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_mr_anisotropic # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_mr_anisotropic # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_2d_langmuir_multi_mr_momentum_conserving # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_mr_momentum_conserving # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_mr_momentum_conserving # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_mr_psatd # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_mr_psatd # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_mr_psatd # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_mr_psatd # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() add_warpx_test( - test_2d_langmuir_multi_nodal # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_nodal # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_nodal # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_nodal # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_2d_langmuir_multi_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000040 # output - OFF # dependency + test_2d_langmuir_multi_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000040 # output + OFF # dependency ) if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_current_correction # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_current_correction # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_current_correction # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_current_correction # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_current_correction_nodal # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_current_correction_nodal # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_current_correction_nodal # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_momentum_conserving # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_momentum_conserving # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_momentum_conserving # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_multiJ # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_multiJ # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_multiJ # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_multiJ # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_multiJ_nodal # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_multiJ_nodal # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_multiJ_nodal # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_nodal # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_nodal # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_nodal # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_nodal # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_vay_deposition # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_vay_deposition # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_vay_deposition # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_vay_deposition_nodal # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_langmuir_multi_psatd_vay_deposition_nodal # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_langmuir_multi_psatd_vay_deposition_nodal # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_langmuir_multi_psatd_vay_deposition_particle_shape_4 # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() add_warpx_test( - test_3d_langmuir_multi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) add_warpx_test( - test_3d_langmuir_multi_nodal # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_nodal # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_nodal # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_nodal # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) add_warpx_test( - test_3d_langmuir_multi_picmi # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000040 # output + OFF # dependency ) if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_current_correction # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_current_correction # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_current_correction # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_current_correction # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_current_correction_nodal # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_current_correction_nodal # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_current_correction_nodal # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_div_cleaning # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_div_cleaning # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_div_cleaning # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_momentum_conserving # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_momentum_conserving # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_momentum_conserving # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_multiJ # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_multiJ # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_multiJ # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_multiJ # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_multiJ_nodal # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_multiJ_nodal # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_multiJ_nodal # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_nodal # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_nodal # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_nodal # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_nodal # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_vay_deposition # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_vay_deposition # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_vay_deposition # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_langmuir_multi_psatd_vay_deposition_nodal # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_multi_psatd_vay_deposition_nodal # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_langmuir_multi_psatd_vay_deposition_nodal # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) endif() add_warpx_test( - test_rz_langmuir_multi # name - RZ # dims + test_rz_langmuir_multi # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_langmuir_multi # inputs - analysis_rz.py # analysis - diags/diag1000080 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_multi # inputs + analysis_rz.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_rz_langmuir_multi_picmi # name - RZ # dims + test_rz_langmuir_multi_picmi # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_langmuir_multi_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000040 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_multi_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000040 # output + OFF # dependency ) if(WarpX_FFT) add_warpx_test( - test_rz_langmuir_multi_psatd # name - RZ # dims + test_rz_langmuir_multi_psatd # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_langmuir_multi_psatd # inputs - analysis_rz.py # analysis - diags/diag1000080 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_multi_psatd # inputs + analysis_rz.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_langmuir_multi_psatd_current_correction # name - RZ # dims + test_rz_langmuir_multi_psatd_current_correction # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_langmuir_multi_psatd_current_correction # inputs - analysis_rz.py # analysis - diags/diag1000080 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_multi_psatd_current_correction # inputs + analysis_rz.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_langmuir_multi_psatd_multiJ # name - RZ # dims + test_rz_langmuir_multi_psatd_multiJ # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_langmuir_multi_psatd_multiJ # inputs - analysis_rz.py # analysis - diags/diag1000080 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_multi_psatd_multiJ # inputs + analysis_rz.py # analysis + diags/diag1000080 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/langmuir_fluids/CMakeLists.txt b/Examples/Tests/langmuir_fluids/CMakeLists.txt index cb927228e2e..8f3ab3ebc78 100644 --- a/Examples/Tests/langmuir_fluids/CMakeLists.txt +++ b/Examples/Tests/langmuir_fluids/CMakeLists.txt @@ -2,45 +2,45 @@ # add_warpx_test( - test_1d_langmuir_fluid # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_langmuir_fluid # inputs - analysis_1d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_1d_langmuir_fluid # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_langmuir_fluid # inputs + analysis_1d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_2d_langmuir_fluid # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_langmuir_fluid # inputs - analysis_2d.py # analysis - diags/diag1000080 # output - OFF # dependency + test_2d_langmuir_fluid # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_langmuir_fluid # inputs + analysis_2d.py # analysis + diags/diag1000080 # output + OFF # dependency ) add_warpx_test( - test_3d_langmuir_fluid # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_langmuir_fluid # inputs - analysis_3d.py # analysis - diags/diag1000040 # output - OFF # dependency + test_3d_langmuir_fluid # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_langmuir_fluid # inputs + analysis_3d.py # analysis + diags/diag1000040 # output + OFF # dependency ) add_warpx_test( - test_rz_langmuir_fluid # name - RZ # dims + test_rz_langmuir_fluid # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_langmuir_fluid # inputs - analysis_rz.py # analysis - diags/diag1000080 # output - OFF # dependency + OFF # eb + inputs_test_rz_langmuir_fluid # inputs + analysis_rz.py # analysis + diags/diag1000080 # output + OFF # dependency ) diff --git a/Examples/Tests/larmor/CMakeLists.txt b/Examples/Tests/larmor/CMakeLists.txt index c66615c5bb3..3ddcc394c98 100644 --- a/Examples/Tests/larmor/CMakeLists.txt +++ b/Examples/Tests/larmor/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_larmor # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_larmor # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_larmor # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_larmor # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Tests/laser_injection/CMakeLists.txt b/Examples/Tests/laser_injection/CMakeLists.txt index 533f87cc13a..577b8bdcebc 100644 --- a/Examples/Tests/laser_injection/CMakeLists.txt +++ b/Examples/Tests/laser_injection/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_1d_laser_injection # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_laser_injection # inputs - analysis_1d.py # analysis - diags/diag1000240 # output - OFF # dependency + test_1d_laser_injection # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_laser_injection # inputs + analysis_1d.py # analysis + diags/diag1000240 # output + OFF # dependency ) add_warpx_test( - test_2d_laser_injection # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_injection # inputs - analysis_2d.py # analysis - diags/diag1000240 # output - OFF # dependency + test_2d_laser_injection # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_injection # inputs + analysis_2d.py # analysis + diags/diag1000240 # output + OFF # dependency ) add_warpx_test( - test_3d_laser_injection # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_laser_injection # inputs - analysis_3d.py # analysis - diags/diag1000020 # output - OFF # dependency + test_3d_laser_injection # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_laser_injection # inputs + analysis_3d.py # analysis + diags/diag1000020 # output + OFF # dependency ) diff --git a/Examples/Tests/laser_injection_from_file/CMakeLists.txt b/Examples/Tests/laser_injection_from_file/CMakeLists.txt index 311f6b0f11b..a4f09f6895d 100644 --- a/Examples/Tests/laser_injection_from_file/CMakeLists.txt +++ b/Examples/Tests/laser_injection_from_file/CMakeLists.txt @@ -2,155 +2,155 @@ # add_warpx_test( - test_2d_laser_injection_from_binary_file_prepare # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_laser_injection_from_binary_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + test_1d_laser_injection_from_lasy_file_prepare # name + 1 # dims + 1 # nprocs + OFF # eb + inputs_test_1d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_2d_laser_injection_from_binary_file # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_laser_injection_from_binary_file # inputs - analysis_2d_binary.py # analysis - diags/diag1000250 # output - test_2d_laser_injection_from_binary_file_prepare # dependency + test_1d_laser_injection_from_lasy_file # name + 1 # dims + 1 # nprocs + OFF # eb + inputs_test_1d_laser_injection_from_lasy_file # inputs + analysis_1d.py # analysis + diags/diag1000251 # output + test_1d_laser_injection_from_lasy_file_prepare # dependency ) add_warpx_test( - test_1d_laser_injection_from_lasy_file_prepare # name - 1 # dims - 1 # nprocs - OFF # eb - inputs_test_1d_laser_injection_from_lasy_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + test_1d_laser_injection_from_lasy_file_boost_prepare # name + 1 # dims + 1 # nprocs + OFF # eb + inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_1d_laser_injection_from_lasy_file # name - 1 # dims - 1 # nprocs - OFF # eb - inputs_test_1d_laser_injection_from_lasy_file # inputs - analysis_1d.py # analysis - diags/diag1000251 # output - test_1d_laser_injection_from_lasy_file_prepare # dependency + test_1d_laser_injection_from_lasy_file_boost # name + 1 # dims + 1 # nprocs + OFF # eb + inputs_test_1d_laser_injection_from_lasy_file_boost # inputs + analysis_1d_boost.py # analysis + diags/diag1000001 # output + test_1d_laser_injection_from_lasy_file_boost_prepare # dependency ) add_warpx_test( - test_1d_laser_injection_from_lasy_file_boost_prepare # name - 1 # dims - 1 # nprocs - OFF # eb - inputs_test_1d_laser_injection_from_lasy_file_boost_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + test_2d_laser_injection_from_binary_file_prepare # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_laser_injection_from_binary_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_1d_laser_injection_from_lasy_file_boost # name - 1 # dims - 1 # nprocs - OFF # eb - inputs_test_1d_laser_injection_from_lasy_file_boost # inputs - analysis_1d_boost.py # analysis - diags/diag1000001 # output - test_1d_laser_injection_from_lasy_file_boost_prepare # dependency + test_2d_laser_injection_from_binary_file # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_laser_injection_from_binary_file # inputs + analysis_2d_binary.py # analysis + diags/diag1000250 # output + test_2d_laser_injection_from_binary_file_prepare # dependency ) add_warpx_test( - test_2d_laser_injection_from_lasy_file_prepare # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_laser_injection_from_lasy_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + test_2d_laser_injection_from_lasy_file_prepare # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_2d_laser_injection_from_lasy_file # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_laser_injection_from_lasy_file # inputs - analysis_2d.py # analysis - diags/diag1000251 # output - test_2d_laser_injection_from_lasy_file_prepare # dependency + test_2d_laser_injection_from_lasy_file # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_laser_injection_from_lasy_file # inputs + analysis_2d.py # analysis + diags/diag1000251 # output + test_2d_laser_injection_from_lasy_file_prepare # dependency ) add_warpx_test( - test_3d_laser_injection_from_lasy_file_prepare # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_laser_injection_from_lasy_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + test_3d_laser_injection_from_lasy_file_prepare # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_3d_laser_injection_from_lasy_file # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_laser_injection_from_lasy_file # inputs - analysis_3d.py # analysis - diags/diag1000251 # output - test_3d_laser_injection_from_lasy_file_prepare # dependency + test_3d_laser_injection_from_lasy_file # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_laser_injection_from_lasy_file # inputs + analysis_3d.py # analysis + diags/diag1000251 # output + test_3d_laser_injection_from_lasy_file_prepare # dependency ) add_warpx_test( - test_rz_laser_injection_from_lasy_file_prepare # name - RZ # dims + test_rz_laser_injection_from_lasy_file_prepare # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_laser_injection_from_lasy_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + OFF # eb + inputs_test_rz_laser_injection_from_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_rz_laser_injection_from_lasy_file # name - RZ # dims + test_rz_laser_injection_from_lasy_file # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_laser_injection_from_lasy_file # inputs - analysis_rz.py # analysis - diags/diag1000252 # output - test_rz_laser_injection_from_lasy_file_prepare # dependency + OFF # eb + inputs_test_rz_laser_injection_from_lasy_file # inputs + analysis_rz.py # analysis + diags/diag1000252 # output + test_rz_laser_injection_from_lasy_file_prepare # dependency ) add_warpx_test( - test_rz_laser_injection_from_RZ_lasy_file_prepare # name - RZ # dims + test_rz_laser_injection_from_RZ_lasy_file_prepare # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py # inputs - OFF # analysis - OFF # output - OFF # dependency + OFF # eb + inputs_test_rz_laser_injection_from_RZ_lasy_file_prepare.py # inputs + OFF # analysis + OFF # output + OFF # dependency ) add_warpx_test( - test_rz_laser_injection_from_RZ_lasy_file # name - RZ # dims + test_rz_laser_injection_from_RZ_lasy_file # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs - analysis_from_RZ_file.py # analysis - diags/diag1000612 # output - test_rz_laser_injection_from_RZ_lasy_file_prepare # dependency + OFF # eb + inputs_test_rz_laser_injection_from_RZ_lasy_file # inputs + analysis_from_RZ_file.py # analysis + diags/diag1000612 # output + test_rz_laser_injection_from_RZ_lasy_file_prepare # dependency ) diff --git a/Examples/Tests/laser_on_fine/CMakeLists.txt b/Examples/Tests/laser_on_fine/CMakeLists.txt index c0f99b09f3e..794d5e68c66 100644 --- a/Examples/Tests/laser_on_fine/CMakeLists.txt +++ b/Examples/Tests/laser_on_fine/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_laser_on_fine # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_laser_on_fine # inputs - analysis_default_regression.py # analysis - diags/diag1000050 # output - OFF # dependency + test_2d_laser_on_fine # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_laser_on_fine # inputs + analysis_default_regression.py # analysis + diags/diag1000050 # output + OFF # dependency ) diff --git a/Examples/Tests/load_external_field/CMakeLists.txt b/Examples/Tests/load_external_field/CMakeLists.txt index 7fba7d4defe..93b0a1436be 100644 --- a/Examples/Tests/load_external_field/CMakeLists.txt +++ b/Examples/Tests/load_external_field/CMakeLists.txt @@ -2,67 +2,67 @@ # add_warpx_test( - test_3d_load_external_field_grid_picmi # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_load_external_field_grid_picmi.py # inputs - analysis_3d.py # analysis - diags/diag1000300 # output - OFF # dependency + test_3d_load_external_field_grid_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_load_external_field_grid_picmi.py # inputs + analysis_3d.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_3d_load_external_field_particle_picmi # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_load_external_field_particle_picmi.py # inputs - analysis_3d.py # analysis - diags/diag1000300 # output - OFF # dependency + test_3d_load_external_field_particle_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_load_external_field_particle_picmi.py # inputs + analysis_3d.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_rz_load_external_field_grid # name - RZ # dims + test_rz_load_external_field_grid # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_load_external_field_grid # inputs - analysis_rz.py # analysis - diags/diag1000300 # output - OFF # dependency + OFF # eb + inputs_test_rz_load_external_field_grid # inputs + analysis_rz.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_rz_load_external_field_grid_restart # name - RZ # dims + test_rz_load_external_field_grid_restart # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_load_external_field_grid_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000300 # output - test_rz_load_external_field_grid # dependency + OFF # eb + inputs_test_rz_load_external_field_grid_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000300 # output + test_rz_load_external_field_grid # dependency ) add_warpx_test( - test_rz_load_external_field_particles # name - RZ # dims + test_rz_load_external_field_particles # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_load_external_field_particles # inputs - analysis_rz.py # analysis - diags/diag1000300 # output - OFF # dependency + OFF # eb + inputs_test_rz_load_external_field_particles # inputs + analysis_rz.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_rz_load_external_field_particles_restart # name - RZ # dims + test_rz_load_external_field_particles_restart # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_load_external_field_particles_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000300 # output - test_rz_load_external_field_particles # dependency + OFF # eb + inputs_test_rz_load_external_field_particles_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000300 # output + test_rz_load_external_field_particles # dependency ) diff --git a/Examples/Tests/magnetostatic_eb/CMakeLists.txt b/Examples/Tests/magnetostatic_eb/CMakeLists.txt index 1420a7186ad..db97a6e11c2 100644 --- a/Examples/Tests/magnetostatic_eb/CMakeLists.txt +++ b/Examples/Tests/magnetostatic_eb/CMakeLists.txt @@ -3,39 +3,39 @@ if(WarpX_EB) add_warpx_test( - test_3d_magnetostatic_eb # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_magnetostatic_eb # inputs - analysis_default_regression.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_magnetostatic_eb # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_magnetostatic_eb # inputs + analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_magnetostatic_eb_picmi # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_magnetostatic_eb_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_magnetostatic_eb_picmi # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_magnetostatic_eb_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_rz_magnetostatic_eb_picmi # name - RZ # dims - 1 # nprocs - ON # eb - inputs_test_rz_magnetostatic_eb_picmi.py # inputs - analysis_rz.py # analysis - diags/diag1000001 # output - OFF # dependency + test_rz_magnetostatic_eb_picmi # name + RZ # dims + 1 # nprocs + ON # eb + inputs_test_rz_magnetostatic_eb_picmi.py # inputs + analysis_rz.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt index 1d684c6e0f7..9e315b7536d 100644 --- a/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt +++ b/Examples/Tests/maxwell_hybrid_qed/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_FFT) add_warpx_test( - test_2d_maxwell_hybrid_qed_solver # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_maxwell_hybrid_qed_solver # inputs - analysis.py # analysis - diags/diag1000300 # output - OFF # dependency + test_2d_maxwell_hybrid_qed_solver # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_maxwell_hybrid_qed_solver # inputs + analysis.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt index e59098821b3..73d0f38beec 100644 --- a/Examples/Tests/nci_fdtd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_fdtd_stability/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_nci_corrector # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_nci_corrector # inputs - analysis_ncicorr.py # analysis - diags/diag1000600 # output - OFF # dependency + test_2d_nci_corrector # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_nci_corrector # inputs + analysis_ncicorr.py # analysis + diags/diag1000600 # output + OFF # dependency ) add_warpx_test( - test_2d_nci_corrector_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_nci_corrector_mr # inputs - analysis_ncicorr.py # analysis - diags/diag1000600 # output - OFF # dependency + test_2d_nci_corrector_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_nci_corrector_mr # inputs + analysis_ncicorr.py # analysis + diags/diag1000600 # output + OFF # dependency ) diff --git a/Examples/Tests/nci_psatd_stability/CMakeLists.txt b/Examples/Tests/nci_psatd_stability/CMakeLists.txt index 52d0241f1b9..6a27abdc783 100644 --- a/Examples/Tests/nci_psatd_stability/CMakeLists.txt +++ b/Examples/Tests/nci_psatd_stability/CMakeLists.txt @@ -3,221 +3,221 @@ if(WarpX_FFT) add_warpx_test( - test_2d_averaged_galilean_psatd # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_averaged_galilean_psatd # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_averaged_galilean_psatd # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_averaged_galilean_psatd # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_averaged_galilean_psatd_hybrid # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_averaged_galilean_psatd_hybrid # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_averaged_galilean_psatd_hybrid # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_averaged_galilean_psatd_hybrid # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_averaged_galilean_psatd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_averaged_galilean_psatd # inputs - analysis_galilean.py # analysis - diags/diag1000160 # output - OFF # dependency + test_2d_comoving_psatd_hybrid # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_comoving_psatd_hybrid # inputs + analysis_default_regression.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_averaged_galilean_psatd_hybrid # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_averaged_galilean_psatd_hybrid # inputs - analysis_galilean.py # analysis - diags/diag1000160 # output - OFF # dependency + test_2d_galilean_psatd # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_galilean_psatd # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_comoving_psatd_hybrid # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_comoving_psatd_hybrid # inputs - analysis_default_regression.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_galilean_psatd_current_correction # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_galilean_psatd # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_galilean_psatd # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_galilean_psatd_current_correction_psb # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_galilean_psatd_current_correction # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_galilean_psatd_current_correction # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_2d_galilean_psatd_hybrid # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_galilean_psatd_hybrid # inputs + analysis_default_regression.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_galilean_psatd_current_correction_psb # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_galilean_psatd_current_correction_psb # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_3d_averaged_galilean_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_averaged_galilean_psatd # inputs + analysis_galilean.py # analysis + diags/diag1000160 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_2d_galilean_psatd_hybrid # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_galilean_psatd_hybrid # inputs - analysis_default_regression.py # analysis - diags/diag1000400 # output - OFF # dependency + test_3d_averaged_galilean_psatd_hybrid # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_averaged_galilean_psatd_hybrid # inputs + analysis_galilean.py # analysis + diags/diag1000160 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_galilean_psatd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_galilean_psatd # inputs - analysis_galilean.py # analysis - diags/diag1000300 # output - OFF # dependency + test_3d_galilean_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_galilean_psatd # inputs + analysis_galilean.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_galilean_psatd_current_correction # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_galilean_psatd_current_correction # inputs - analysis_galilean.py # analysis - diags/diag1000300 # output - OFF # dependency + test_3d_galilean_psatd_current_correction # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_galilean_psatd_current_correction_psb # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_galilean_psatd_current_correction_psb # inputs - analysis_galilean.py # analysis - diags/diag1000300 # output - OFF # dependency + test_3d_galilean_psatd_current_correction_psb # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_galilean_psatd # name - RZ # dims - 1 # nprocs - OFF # eb - inputs_test_rz_galilean_psatd # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_3d_uniform_plasma_multiJ # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_uniform_plasma_multiJ # inputs + analysis_multiJ.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_galilean_psatd_current_correction # name - RZ # dims - 2 # nprocs - OFF # eb - inputs_test_rz_galilean_psatd_current_correction # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_rz_galilean_psatd # name + RZ # dims + 1 # nprocs + OFF # eb + inputs_test_rz_galilean_psatd # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_galilean_psatd_current_correction_psb # name - RZ # dims - 1 # nprocs - OFF # eb - inputs_test_rz_galilean_psatd_current_correction_psb # inputs - analysis_galilean.py # analysis - diags/diag1000400 # output - OFF # dependency + test_rz_galilean_psatd_current_correction # name + RZ # dims + 2 # nprocs + OFF # eb + inputs_test_rz_galilean_psatd_current_correction # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_multiJ_psatd # name - RZ # dims - 2 # nprocs - OFF # eb - inputs_test_rz_multiJ_psatd # inputs - analysis_default_regression.py # analysis - diags/diag1000050 # output - OFF # dependency + test_rz_galilean_psatd_current_correction_psb # name + RZ # dims + 1 # nprocs + OFF # eb + inputs_test_rz_galilean_psatd_current_correction_psb # inputs + analysis_galilean.py # analysis + diags/diag1000400 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_uniform_plasma_multiJ # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_uniform_plasma_multiJ # inputs - analysis_multiJ.py # analysis - diags/diag1000300 # output - OFF # dependency + test_rz_multiJ_psatd # name + RZ # dims + 2 # nprocs + OFF # eb + inputs_test_rz_multiJ_psatd # inputs + analysis_default_regression.py # analysis + diags/diag1000050 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/nodal_electrostatic/CMakeLists.txt b/Examples/Tests/nodal_electrostatic/CMakeLists.txt index e516edc8af6..62627eb576a 100644 --- a/Examples/Tests/nodal_electrostatic/CMakeLists.txt +++ b/Examples/Tests/nodal_electrostatic/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_nodal_electrostatic_solver # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_nodal_electrostatic_solver # inputs - analysis.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_nodal_electrostatic_solver # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_nodal_electrostatic_solver # inputs + analysis.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Tests/nuclear_fusion/CMakeLists.txt b/Examples/Tests/nuclear_fusion/CMakeLists.txt index 8be92ab7bda..4ed47607c8d 100644 --- a/Examples/Tests/nuclear_fusion/CMakeLists.txt +++ b/Examples/Tests/nuclear_fusion/CMakeLists.txt @@ -2,67 +2,67 @@ # add_warpx_test( - test_3d_deuterium_deuterium_fusion # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_deuterium_deuterium_fusion # inputs - analysis_two_product_fusion.py # analysis - diags/diag1000001 # output - OFF # dependency + test_2d_proton_boron_fusion # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_proton_boron_fusion # inputs + analysis_proton_boron_fusion.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_deuterium_deuterium_fusion_intraspecies # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs - analysis_deuterium_deuterium_3d_intraspecies.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_deuterium_deuterium_fusion # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_deuterium_deuterium_fusion # inputs + analysis_two_product_fusion.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_deuterium_tritium_fusion # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_deuterium_tritium_fusion # inputs - analysis_two_product_fusion.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_deuterium_deuterium_fusion_intraspecies # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_deuterium_deuterium_fusion_intraspecies # inputs + analysis_deuterium_deuterium_3d_intraspecies.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_rz_deuterium_tritium_fusion # name - RZ # dims + test_3d_deuterium_tritium_fusion # name + 3 # dims 2 # nprocs - OFF # eb - inputs_test_rz_deuterium_tritium_fusion # inputs - analysis_two_product_fusion.py # analysis - diags/diag1000001 # output - OFF # dependency + OFF # eb + inputs_test_3d_deuterium_tritium_fusion # inputs + analysis_two_product_fusion.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_2d_proton_boron_fusion # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_proton_boron_fusion # inputs - analysis_proton_boron_fusion.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_proton_boron_fusion # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_proton_boron_fusion # inputs + analysis_proton_boron_fusion.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_proton_boron_fusion # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_proton_boron_fusion # inputs - analysis_proton_boron_fusion.py # analysis - diags/diag1000001 # output - OFF # dependency + test_rz_deuterium_tritium_fusion # name + RZ # dims + 2 # nprocs + OFF # eb + inputs_test_rz_deuterium_tritium_fusion # inputs + analysis_two_product_fusion.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt index 8aa6e411d7b..ce5bed2c587 100644 --- a/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_em_modes/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_1d_ohm_solver_em_modes_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - "inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs - analysis.py # analysis - diags/field_diag000250 # output - OFF # dependency + test_1d_ohm_solver_em_modes_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + "inputs_test_1d_ohm_solver_em_modes_picmi.py --test --dim 1 --bdir z" # inputs + analysis.py # analysis + diags/field_diag000250 # output + OFF # dependency ) add_warpx_test( - test_rz_ohm_solver_em_modes_picmi # name - RZ # dims + test_rz_ohm_solver_em_modes_picmi # name + RZ # dims 2 # nprocs - OFF # eb - "inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs - analysis_rz.py # analysis - diags/diag1000100 # output - OFF # dependency + OFF # eb + "inputs_test_rz_ohm_solver_em_modes_picmi.py --test" # inputs + analysis_rz.py # analysis + diags/diag1000100 # output + OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt index 0e9a960b0fe..e5017318f19 100644 --- a/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_ion_Landau_damping/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_ohm_solver_landau_damping_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - "inputs_test_2d_ohm_solver_landau_damping_picmi.py --test --dim 2 --temp_ratio 0.1" # inputs - analysis.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_ohm_solver_landau_damping_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "inputs_test_2d_ohm_solver_landau_damping_picmi.py --test --dim 2 --temp_ratio 0.1" # inputs + analysis.py # analysis + diags/diag1000100 # output + OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt index 07818c28ce4..a6c978ba3ef 100644 --- a/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_ion_beam_instability/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_1d_ohm_solver_ion_beam_picmi # name - 1 # dims - 2 # nprocs - OFF # eb - "inputs_test_1d_ohm_solver_ion_beam_picmi.py --test --dim 1 --resonant" # inputs - analysis.py # analysis - diags/diag1002500 # output - OFF # dependency + test_1d_ohm_solver_ion_beam_picmi # name + 1 # dims + 2 # nprocs + OFF # eb + "inputs_test_1d_ohm_solver_ion_beam_picmi.py --test --dim 1 --resonant" # inputs + analysis.py # analysis + diags/diag1002500 # output + OFF # dependency ) diff --git a/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt index 6bf33dc6f31..849d4c3b2a3 100644 --- a/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt +++ b/Examples/Tests/ohm_solver_magnetic_reconnection/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_ohm_solver_magnetic_reconnection_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - "inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py --test" # inputs - analysis.py # analysis - diags/diag1000020 # output - OFF # dependency + test_2d_ohm_solver_magnetic_reconnection_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "inputs_test_2d_ohm_solver_magnetic_reconnection_picmi.py --test" # inputs + analysis.py # analysis + diags/diag1000020 # output + OFF # dependency ) diff --git a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt index a5282af1e5d..1f921ae98b2 100644 --- a/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt +++ b/Examples/Tests/open_bc_poisson_solver/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_FFT) add_warpx_test( - test_3d_open_bc_poisson_solver # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_open_bc_poisson_solver # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_open_bc_poisson_solver # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_open_bc_poisson_solver # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt index 18f8be57401..b7517ef9bc4 100644 --- a/Examples/Tests/particle_boundary_interaction/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_interaction/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_EB) add_warpx_test( - test_rz_particle_boundary_interaction_picmi # name - RZ # dims + test_rz_particle_boundary_interaction_picmi # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_particle_boundary_interaction_picmi.py # inputs - analysis.py # analysis - diags/diag1/ # output - OFF # dependency + ON # eb + inputs_test_rz_particle_boundary_interaction_picmi.py # inputs + analysis.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_boundary_process/CMakeLists.txt b/Examples/Tests/particle_boundary_process/CMakeLists.txt index edcf12a6311..a674c72abe3 100644 --- a/Examples/Tests/particle_boundary_process/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_process/CMakeLists.txt @@ -1,26 +1,26 @@ # Add tests (alphabetical order) ############################################## # +add_warpx_test( + test_2d_particle_reflection_picmi # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_particle_reflection_picmi.py # inputs + analysis_reflection.py # analysis + diags/diag1000010 # output + OFF # dependency +) + if(WarpX_EB) add_warpx_test( - test_3d_particle_absorption # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_particle_absorption # inputs - analysis_absorption.py # analysis - diags/diag1000060 # output - OFF # dependency + test_3d_particle_absorption # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_particle_absorption # inputs + analysis_absorption.py # analysis + diags/diag1000060 # output + OFF # dependency ) endif() - -add_warpx_test( - test_2d_particle_reflection_picmi # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_particle_reflection_picmi.py # inputs - analysis_reflection.py # analysis - diags/diag1000010 # output - OFF # dependency -) diff --git a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt index 38dc57e9ccd..361f99bfb09 100644 --- a/Examples/Tests/particle_boundary_scrape/CMakeLists.txt +++ b/Examples/Tests/particle_boundary_scrape/CMakeLists.txt @@ -3,26 +3,26 @@ if(WarpX_EB) add_warpx_test( - test_3d_particle_scrape # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_particle_scrape # inputs - analysis_scrape.py # analysis - diags/diag1000060 # output - OFF # dependency + test_3d_particle_scrape # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_particle_scrape # inputs + analysis_scrape.py # analysis + diags/diag1000060 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_3d_particle_scrape_picmi # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_particle_scrape_picmi.py # inputs - analysis_scrape.py # analysis - diags/diag1000060 # output - OFF # dependency + test_3d_particle_scrape_picmi # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_particle_scrape_picmi.py # inputs + analysis_scrape.py # analysis + diags/diag1000060 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/particle_data_python/CMakeLists.txt b/Examples/Tests/particle_data_python/CMakeLists.txt index a57453cf91d..45bed4e9cf6 100644 --- a/Examples/Tests/particle_data_python/CMakeLists.txt +++ b/Examples/Tests/particle_data_python/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_2d_prev_positions_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_prev_positions_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_particle_attr_access_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_particle_attr_access_picmi.py # inputs + analysis.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_2d_particle_attr_access_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_particle_attr_access_picmi.py # inputs - analysis.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_particle_attr_access_unique_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + "inputs_test_2d_particle_attr_access_picmi.py --unique" # inputs + analysis.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_2d_particle_attr_access_unique_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - "inputs_test_2d_particle_attr_access_picmi.py --unique" # inputs - analysis.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_prev_positions_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_prev_positions_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) diff --git a/Examples/Tests/particle_fields_diags/CMakeLists.txt b/Examples/Tests/particle_fields_diags/CMakeLists.txt index 1fc6ce46116..b35ffe46713 100644 --- a/Examples/Tests/particle_fields_diags/CMakeLists.txt +++ b/Examples/Tests/particle_fields_diags/CMakeLists.txt @@ -2,24 +2,24 @@ # add_warpx_test( - test_3d_particle_fields_diags # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_particle_fields_diags # inputs - analysis_particle_diags.py # analysis - diags/diag1000200 # output - OFF # dependency + test_3d_particle_fields_diags # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_particle_fields_diags # inputs + analysis_particle_diags.py # analysis + diags/diag1000200 # output + OFF # dependency ) # FIXME #add_warpx_test( -# test_3d_particle_fields_diags_single_precision # name -# 3 # dims -# 2 # nprocs -# OFF # eb -# inputs_test_3d_particle_fields_diags # inputs -# analysis_particle_diags_single.py # analysis -# diags/diag1000200 # output -# OFF # dependency +# test_3d_particle_fields_diags_single_precision # name +# 3 # dims +# 2 # nprocs +# OFF # eb +# inputs_test_3d_particle_fields_diags # inputs +# analysis_particle_diags_single.py # analysis +# diags/diag1000200 # output +# OFF # dependency #) diff --git a/Examples/Tests/particle_pusher/CMakeLists.txt b/Examples/Tests/particle_pusher/CMakeLists.txt index ec37d936bb6..583106014a5 100644 --- a/Examples/Tests/particle_pusher/CMakeLists.txt +++ b/Examples/Tests/particle_pusher/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_particle_pusher # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_particle_pusher # inputs - analysis.py # analysis - diags/diag1010000 # output - OFF # dependency + test_3d_particle_pusher # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_particle_pusher # inputs + analysis.py # analysis + diags/diag1010000 # output + OFF # dependency ) diff --git a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt index 951f92515ee..26478b59c07 100644 --- a/Examples/Tests/particle_thermal_boundary/CMakeLists.txt +++ b/Examples/Tests/particle_thermal_boundary/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_particle_thermal_boundary # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_particle_thermal_boundary # inputs - analysis.py # analysis - diags/diag1002000 # output - OFF # dependency + test_2d_particle_thermal_boundary # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_particle_thermal_boundary # inputs + analysis.py # analysis + diags/diag1002000 # output + OFF # dependency ) diff --git a/Examples/Tests/particles_in_pml/CMakeLists.txt b/Examples/Tests/particles_in_pml/CMakeLists.txt index 00007a44741..e8f1a13601d 100644 --- a/Examples/Tests/particles_in_pml/CMakeLists.txt +++ b/Examples/Tests/particles_in_pml/CMakeLists.txt @@ -2,45 +2,45 @@ # add_warpx_test( - test_2d_particles_in_pml # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_particles_in_pml # inputs - analysis_particles_in_pml.py # analysis - diags/diag1000180 # output - OFF # dependency + test_2d_particles_in_pml # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_particles_in_pml # inputs + analysis_particles_in_pml.py # analysis + diags/diag1000180 # output + OFF # dependency ) add_warpx_test( - test_2d_particles_in_pml_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_particles_in_pml_mr # inputs - analysis_particles_in_pml.py # analysis - diags/diag1000300 # output - OFF # dependency + test_2d_particles_in_pml_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_particles_in_pml_mr # inputs + analysis_particles_in_pml.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_3d_particles_in_pml # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_particles_in_pml # inputs - analysis_particles_in_pml.py # analysis - diags/diag1000120 # output - OFF # dependency + test_3d_particles_in_pml # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_particles_in_pml # inputs + analysis_particles_in_pml.py # analysis + diags/diag1000120 # output + OFF # dependency ) add_warpx_test( - test_3d_particles_in_pml_mr # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_particles_in_pml_mr # inputs - analysis_particles_in_pml.py # analysis - diags/diag1000200 # output - OFF # dependency + test_3d_particles_in_pml_mr # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_particles_in_pml_mr # inputs + analysis_particles_in_pml.py # analysis + diags/diag1000200 # output + OFF # dependency ) diff --git a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt index f9f652691e1..f68986d363a 100644 --- a/Examples/Tests/pass_mpi_communicator/CMakeLists.txt +++ b/Examples/Tests/pass_mpi_communicator/CMakeLists.txt @@ -6,12 +6,12 @@ # - Enable related lines in input script # - Enable analysis script add_warpx_test( - test_2d_pass_mpi_comm_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pass_mpi_comm_picmi.py # inputs - OFF #analysis.py # analysis - OFF # output - OFF # dependency + test_2d_pass_mpi_comm_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pass_mpi_comm_picmi.py # inputs + OFF #analysis.py # analysis + OFF # output + OFF # dependency ) diff --git a/Examples/Tests/pec/CMakeLists.txt b/Examples/Tests/pec/CMakeLists.txt index 97516ddbc28..69c68ec5329 100644 --- a/Examples/Tests/pec/CMakeLists.txt +++ b/Examples/Tests/pec/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_3d_pec_field # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_pec_field # inputs - analysis_pec.py # analysis - diags/diag1000125 # output - OFF # dependency + test_3d_pec_field # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_pec_field # inputs + analysis_pec.py # analysis + diags/diag1000125 # output + OFF # dependency ) add_warpx_test( - test_3d_pec_field_mr # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_pec_field_mr # inputs - analysis_pec_mr.py # analysis - diags/diag1000125 # output - OFF # dependency + test_3d_pec_field_mr # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_pec_field_mr # inputs + analysis_pec_mr.py # analysis + diags/diag1000125 # output + OFF # dependency ) add_warpx_test( - test_3d_pec_particle # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_pec_particle # inputs - analysis_default_regression.py # analysis - diags/diag1000020 # output - OFF # dependency + test_3d_pec_particle # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_pec_particle # inputs + analysis_default_regression.py # analysis + diags/diag1000020 # output + OFF # dependency ) diff --git a/Examples/Tests/photon_pusher/CMakeLists.txt b/Examples/Tests/photon_pusher/CMakeLists.txt index 1a86ef0b88f..491906e0466 100644 --- a/Examples/Tests/photon_pusher/CMakeLists.txt +++ b/Examples/Tests/photon_pusher/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_photon_pusher # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_photon_pusher # inputs - analysis.py # analysis - diags/diag1000050 # output - OFF # dependency + test_3d_photon_pusher # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_photon_pusher # inputs + analysis.py # analysis + diags/diag1000050 # output + OFF # dependency ) diff --git a/Examples/Tests/plasma_lens/CMakeLists.txt b/Examples/Tests/plasma_lens/CMakeLists.txt index 60a4c95bdea..cdba552db9e 100644 --- a/Examples/Tests/plasma_lens/CMakeLists.txt +++ b/Examples/Tests/plasma_lens/CMakeLists.txt @@ -2,56 +2,56 @@ # add_warpx_test( - test_3d_plasma_lens # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_lens # inputs - analysis.py # analysis - diags/diag1000084 # output - OFF # dependency + test_3d_plasma_lens # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_lens # inputs + analysis.py # analysis + diags/diag1000084 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_lens_boosted # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_lens_boosted # inputs - analysis.py # analysis - diags/diag1000084 # output - OFF # dependency + test_3d_plasma_lens_boosted # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_lens_boosted # inputs + analysis.py # analysis + diags/diag1000084 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_lens_hard_edged # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_lens_hard_edged # inputs - analysis.py # analysis - diags/diag1000084 # output - OFF # dependency + test_3d_plasma_lens_hard_edged # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_lens_hard_edged # inputs + analysis.py # analysis + diags/diag1000084 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_lens_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_lens_picmi.py # inputs - analysis.py # analysis - diags/diag1000084 # output - OFF # dependency + test_3d_plasma_lens_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_lens_picmi.py # inputs + analysis.py # analysis + diags/diag1000084 # output + OFF # dependency ) add_warpx_test( - test_3d_plasma_lens_short # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_plasma_lens_short # inputs - analysis.py # analysis - diags/diag1000084 # output - OFF # dependency + test_3d_plasma_lens_short # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_plasma_lens_short # inputs + analysis.py # analysis + diags/diag1000084 # output + OFF # dependency ) diff --git a/Examples/Tests/pml/CMakeLists.txt b/Examples/Tests/pml/CMakeLists.txt index 321ea3669ed..92847dfff24 100644 --- a/Examples/Tests/pml/CMakeLists.txt +++ b/Examples/Tests/pml/CMakeLists.txt @@ -1,94 +1,100 @@ # Add tests (alphabetical order) ############################################## # +add_warpx_test( + test_2d_pml_x_ckc # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pml_x_ckc # inputs + analysis_pml_ckc.py # analysis + diags/diag1000300 # output + OFF # dependency +) + if(WarpX_FFT) add_warpx_test( - test_3d_pml_psatd_dive_divb_cleaning # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs - analysis_default_regression.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_pml_x_galilean # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pml_x_galilean # inputs + analysis_pml_psatd.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_rz_pml_psatd # name - RZ # dims + test_2d_pml_x_psatd # name + 2 # dims 2 # nprocs - OFF # eb - inputs_test_rz_pml_psatd # inputs - analysis_pml_psatd_rz.py # analysis - diags/diag1000500 # output - OFF # dependency + OFF # eb + inputs_test_2d_pml_x_psatd # inputs + analysis_pml_psatd.py # analysis + diags/diag1000300 # output + OFF # dependency ) endif() -add_warpx_test( - test_2d_pml_x_ckc # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_ckc # inputs - analysis_pml_ckc.py # analysis - diags/diag1000300 # output - OFF # dependency -) - -add_warpx_test( - test_2d_pml_x_galilean # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_galilean # inputs - analysis_pml_psatd.py # analysis - diags/diag1000300 # output - OFF # dependency -) +if(WarpX_FFT) + add_warpx_test( + test_2d_pml_x_psatd_restart # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pml_x_psatd_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000300 # output + test_2d_pml_x_psatd # dependency + ) +endif() add_warpx_test( - test_2d_pml_x_psatd # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_psatd # inputs - analysis_pml_psatd.py # analysis - diags/diag1000300 # output - OFF # dependency + test_2d_pml_x_yee # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pml_x_yee # inputs + analysis_pml_yee.py # analysis + diags/diag1000300 # output + OFF # dependency ) add_warpx_test( - test_2d_pml_x_psatd_restart # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_psatd_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000300 # output - test_2d_pml_x_psatd # dependency + test_2d_pml_x_yee_restart # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_pml_x_yee_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000300 # output + test_2d_pml_x_yee # dependency ) -add_warpx_test( - test_2d_pml_x_yee # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_yee # inputs - analysis_pml_yee.py # analysis - diags/diag1000300 # output - OFF # dependency -) +if(WarpX_FFT) + add_warpx_test( + test_3d_pml_psatd_dive_divb_cleaning # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_pml_psatd_dive_divb_cleaning # inputs + analysis_default_regression.py # analysis + diags/diag1000100 # output + OFF # dependency + ) +endif() -add_warpx_test( - test_2d_pml_x_yee_restart # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_pml_x_yee_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000300 # output - test_2d_pml_x_yee # dependency -) +if(WarpX_FFT) + add_warpx_test( + test_rz_pml_psatd # name + RZ # dims + 2 # nprocs + OFF # eb + inputs_test_rz_pml_psatd # inputs + analysis_pml_psatd_rz.py # analysis + diags/diag1000500 # output + OFF # dependency + ) +endif() diff --git a/Examples/Tests/point_of_contact_eb/CMakeLists.txt b/Examples/Tests/point_of_contact_eb/CMakeLists.txt index e3ed23a67c2..25bf4b977de 100644 --- a/Examples/Tests/point_of_contact_eb/CMakeLists.txt +++ b/Examples/Tests/point_of_contact_eb/CMakeLists.txt @@ -3,26 +3,26 @@ if(WarpX_EB) add_warpx_test( - test_3d_point_of_contact_eb # name - 3 # dims - 2 # nprocs - ON # eb - inputs_test_3d_point_of_contact_eb # inputs - analysis.py # analysis - diags/diag1/ # output - OFF # dependency + test_3d_point_of_contact_eb # name + 3 # dims + 2 # nprocs + ON # eb + inputs_test_3d_point_of_contact_eb # inputs + analysis.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_rz_point_of_contact_eb # name - RZ # dims + test_rz_point_of_contact_eb # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_point_of_contact_eb # inputs - analysis.py # analysis - diags/diag1/ # output - OFF # dependency + ON # eb + inputs_test_rz_point_of_contact_eb # inputs + analysis.py # analysis + diags/diag1/ # output + OFF # dependency ) endif() diff --git a/Examples/Tests/projection_divb_cleaner/CMakeLists.txt b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt index 48264372872..91dd6bdc592 100644 --- a/Examples/Tests/projection_divb_cleaner/CMakeLists.txt +++ b/Examples/Tests/projection_divb_cleaner/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_3d_projection_divb_cleaner_picmi # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_projection_divb_cleaner_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_projection_divb_cleaner_callback_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_projection_divb_cleaner_callback_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_projection_divb_cleaner_callback_picmi # name - 3 # dims - 1 # nprocs - OFF # eb - inputs_test_3d_projection_divb_cleaner_callback_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_projection_divb_cleaner_picmi # name + 3 # dims + 1 # nprocs + OFF # eb + inputs_test_3d_projection_divb_cleaner_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_rz_projection_divb_cleaner # name - RZ # dims + test_rz_projection_divb_cleaner # name + RZ # dims 1 # nprocs - OFF # eb - inputs_test_rz_projection_divb_cleaner # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + OFF # eb + inputs_test_rz_projection_divb_cleaner # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/python_wrappers/CMakeLists.txt b/Examples/Tests/python_wrappers/CMakeLists.txt index f7ba5cc099d..83fc6e16f7d 100644 --- a/Examples/Tests/python_wrappers/CMakeLists.txt +++ b/Examples/Tests/python_wrappers/CMakeLists.txt @@ -3,13 +3,13 @@ if(WarpX_FFT) add_warpx_test( - test_2d_python_wrappers_picmi # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_python_wrappers_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000100 # output - OFF # dependency + test_2d_python_wrappers_picmi # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_python_wrappers_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000100 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/qed/CMakeLists.txt b/Examples/Tests/qed/CMakeLists.txt index 42c36660801..77690642f07 100644 --- a/Examples/Tests/qed/CMakeLists.txt +++ b/Examples/Tests/qed/CMakeLists.txt @@ -2,111 +2,111 @@ # add_warpx_test( - test_2d_qed_breit_wheeler # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_qed_breit_wheeler # inputs - analysis_breit_wheeler_yt.py # analysis - diags/diag1000002 # output - OFF # dependency + test_2d_qed_breit_wheeler # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_qed_breit_wheeler # inputs + analysis_breit_wheeler_yt.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_2d_qed_breit_wheeler_opmd # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_qed_breit_wheeler_opmd # inputs - analysis_breit_wheeler_opmd.py # analysis - diags/diag1/ # output - OFF # dependency + test_2d_qed_breit_wheeler_opmd # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_qed_breit_wheeler_opmd # inputs + analysis_breit_wheeler_opmd.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_3d_qed_breit_wheeler # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_breit_wheeler # inputs - analysis_breit_wheeler_yt.py # analysis - diags/diag1000002 # output - OFF # dependency + test_2d_qed_quantum_sync # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_qed_quantum_sync # inputs + analysis_quantum_sync.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_3d_qed_breit_wheeler_opmd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_breit_wheeler_opmd # inputs - analysis_breit_wheeler_opmd.py # analysis - diags/diag1/ # output - OFF # dependency + test_3d_qed_breit_wheeler # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_breit_wheeler # inputs + analysis_breit_wheeler_yt.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_2d_qed_quantum_sync # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_qed_quantum_sync # inputs - analysis_quantum_sync.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_qed_breit_wheeler_opmd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_breit_wheeler_opmd # inputs + analysis_breit_wheeler_opmd.py # analysis + diags/diag1/ # output + OFF # dependency ) add_warpx_test( - test_3d_qed_quantum_sync # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_quantum_sync # inputs - analysis_quantum_sync.py # analysis - diags/diag1000002 # output - OFF # dependency + test_3d_qed_quantum_sync # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_quantum_sync # inputs + analysis_quantum_sync.py # analysis + diags/diag1000002 # output + OFF # dependency ) add_warpx_test( - test_3d_qed_schwinger_1 # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_schwinger_1 # inputs - analysis_schwinger.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_qed_schwinger_1 # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_schwinger_1 # inputs + analysis_schwinger.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_qed_schwinger_2 # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_schwinger_2 # inputs - analysis_schwinger.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_qed_schwinger_2 # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_schwinger_2 # inputs + analysis_schwinger.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_qed_schwinger_3 # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_schwinger_3 # inputs - analysis_schwinger.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_qed_schwinger_3 # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_schwinger_3 # inputs + analysis_schwinger.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_qed_schwinger_4 # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_qed_schwinger_4 # inputs - analysis_schwinger.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_qed_schwinger_4 # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_qed_schwinger_4 # inputs + analysis_schwinger.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/radiation_reaction/CMakeLists.txt b/Examples/Tests/radiation_reaction/CMakeLists.txt index bc4b47664d2..63814f30f29 100644 --- a/Examples/Tests/radiation_reaction/CMakeLists.txt +++ b/Examples/Tests/radiation_reaction/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_radiation_reaction # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_radiation_reaction # inputs - analysis.py # analysis - diags/diag1000064 # output - OFF # dependency + test_3d_radiation_reaction # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_radiation_reaction # inputs + analysis.py # analysis + diags/diag1000064 # output + OFF # dependency ) diff --git a/Examples/Tests/reduced_diags/CMakeLists.txt b/Examples/Tests/reduced_diags/CMakeLists.txt index b27fb9d929d..a09d5403270 100644 --- a/Examples/Tests/reduced_diags/CMakeLists.txt +++ b/Examples/Tests/reduced_diags/CMakeLists.txt @@ -2,58 +2,58 @@ # add_warpx_test( - test_3d_reduced_diags # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_reduced_diags # inputs - analysis_reduced_diags.py # analysis - diags/diag1000200 # output - OFF # dependency + test_3d_reduced_diags # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_reduced_diags # inputs + analysis_reduced_diags.py # analysis + diags/diag1000200 # output + OFF # dependency ) add_warpx_test( - test_3d_reduced_diags_load_balance_costs_heuristic # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs - analysis_reduced_diags_load_balance_costs.py # analysis - diags/diag1000003 # output - OFF # dependency + test_3d_reduced_diags_load_balance_costs_heuristic # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_reduced_diags_load_balance_costs_heuristic # inputs + analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output + OFF # dependency ) add_warpx_test( - test_3d_reduced_diags_load_balance_costs_timers # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs - analysis_reduced_diags_load_balance_costs.py # analysis - diags/diag1000003 # output - OFF # dependency + test_3d_reduced_diags_load_balance_costs_timers # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_reduced_diags_load_balance_costs_timers # inputs + analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output + OFF # dependency ) add_warpx_test( - test_3d_reduced_diags_load_balance_costs_timers_picmi # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs - analysis_reduced_diags_load_balance_costs.py # analysis - diags/diag1000003 # output - OFF # dependency + test_3d_reduced_diags_load_balance_costs_timers_picmi # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_reduced_diags_load_balance_costs_timers_picmi.py # inputs + analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output + OFF # dependency ) if(WarpX_FFT) add_warpx_test( - test_3d_reduced_diags_load_balance_costs_timers_psatd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs - analysis_reduced_diags_load_balance_costs.py # analysis - diags/diag1000003 # output - OFF # dependency + test_3d_reduced_diags_load_balance_costs_timers_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_reduced_diags_load_balance_costs_timers_psatd # inputs + analysis_reduced_diags_load_balance_costs.py # analysis + diags/diag1000003 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt index 329bc1e1e1c..9ee2a63d2d2 100644 --- a/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/relativistic_space_charge_initialization/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_3d_relativistic_space_charge_initialization # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_relativistic_space_charge_initialization # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_relativistic_space_charge_initialization # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_relativistic_space_charge_initialization # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/repelling_particles/CMakeLists.txt b/Examples/Tests/repelling_particles/CMakeLists.txt index c8e451ba5fe..ed662b67332 100644 --- a/Examples/Tests/repelling_particles/CMakeLists.txt +++ b/Examples/Tests/repelling_particles/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_repelling_particles # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_repelling_particles # inputs - analysis.py # analysis - diags/diag1000200 # output - OFF # dependency + test_2d_repelling_particles # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_repelling_particles # inputs + analysis.py # analysis + diags/diag1000200 # output + OFF # dependency ) diff --git a/Examples/Tests/resampling/CMakeLists.txt b/Examples/Tests/resampling/CMakeLists.txt index 2ff16d3cd55..10d51e0ea47 100644 --- a/Examples/Tests/resampling/CMakeLists.txt +++ b/Examples/Tests/resampling/CMakeLists.txt @@ -2,34 +2,34 @@ # add_warpx_test( - test_2d_leveling_thinning # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_leveling_thinning # inputs - analysis.py # analysis - diags/diag1000008 # output - OFF # dependency + test_1d_resample_velocity_coincidence_thinning # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_resample_velocity_coincidence_thinning # inputs + analysis_default_regression.py # analysis + diags/diag1000004 # output + OFF # dependency ) add_warpx_test( - test_1d_resample_velocity_coincidence_thinning # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_resample_velocity_coincidence_thinning # inputs - analysis_default_regression.py # analysis - diags/diag1000004 # output - OFF # dependency + test_1d_resample_velocity_coincidence_thinning_cartesian # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs + analysis_default_regression.py # analysis + diags/diag1000004 # output + OFF # dependency ) add_warpx_test( - test_1d_resample_velocity_coincidence_thinning_cartesian # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_resample_velocity_coincidence_thinning_cartesian # inputs - analysis_default_regression.py # analysis - diags/diag1000004 # output - OFF # dependency + test_2d_leveling_thinning # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_leveling_thinning # inputs + analysis.py # analysis + diags/diag1000008 # output + OFF # dependency ) diff --git a/Examples/Tests/restart/CMakeLists.txt b/Examples/Tests/restart/CMakeLists.txt index 170dceca96e..33770495dc6 100644 --- a/Examples/Tests/restart/CMakeLists.txt +++ b/Examples/Tests/restart/CMakeLists.txt @@ -2,114 +2,114 @@ # add_warpx_test( - test_2d_id_cpu_read_picmi # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_id_cpu_read_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_2d_id_cpu_read_picmi # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_id_cpu_read_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) # TODO # - Add checksums file # - Enable analysis add_warpx_test( - test_2d_runtime_components_picmi # name - 2 # dims - 1 # nprocs - OFF # eb - inputs_test_2d_runtime_components_picmi.py # inputs - OFF #analysis_default_regression.py # analysis - OFF #diags/diag1000010 # output - OFF # dependency + test_2d_runtime_components_picmi # name + 2 # dims + 1 # nprocs + OFF # eb + inputs_test_2d_runtime_components_picmi.py # inputs + OFF #analysis_default_regression.py # analysis + OFF #diags/diag1000010 # output + OFF # dependency ) # TODO # - Add checksums file # - Enable analysis add_warpx_test( - test_2d_runtime_components_picmi_restart # name - 2 # dims - 1 # nprocs - OFF # eb - "inputs_test_2d_runtime_components_picmi.py amr.restart='../test_2d_runtime_components_picmi/diags/chk000005'" # inputs - OFF #analysis_default_restart.py # analysis - OFF #diags/diag1000010 # output - test_2d_runtime_components_picmi # dependency + test_2d_runtime_components_picmi_restart # name + 2 # dims + 1 # nprocs + OFF # eb + "inputs_test_2d_runtime_components_picmi.py amr.restart='../test_2d_runtime_components_picmi/diags/chk000005'" # inputs + OFF #analysis_default_restart.py # analysis + OFF #diags/diag1000010 # output + test_2d_runtime_components_picmi # dependency ) add_warpx_test( - test_3d_acceleration # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_acceleration # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) add_warpx_test( - test_3d_acceleration_restart # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000010 # output - test_3d_acceleration # dependency + test_3d_acceleration_restart # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000010 # output + test_3d_acceleration # dependency ) if(WarpX_FFT) add_warpx_test( - test_3d_acceleration_psatd # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration_psatd # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_acceleration_psatd # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration_psatd # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_acceleration_psatd_restart # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration_psatd_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000010 # output - test_3d_acceleration_psatd # dependency + test_3d_acceleration_psatd_restart # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration_psatd_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000010 # output + test_3d_acceleration_psatd # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_acceleration_psatd_time_avg # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration_psatd_time_avg # inputs - analysis_default_regression.py # analysis - diags/diag1000010 # output - OFF # dependency + test_3d_acceleration_psatd_time_avg # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration_psatd_time_avg # inputs + analysis_default_regression.py # analysis + diags/diag1000010 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_acceleration_psatd_time_avg_restart # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_acceleration_psatd_time_avg_restart # inputs - analysis_default_restart.py # analysis - diags/diag1000010 # output - test_3d_acceleration_psatd_time_avg # dependency + test_3d_acceleration_psatd_time_avg_restart # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_acceleration_psatd_time_avg_restart # inputs + analysis_default_restart.py # analysis + diags/diag1000010 # output + test_3d_acceleration_psatd_time_avg # dependency ) endif() diff --git a/Examples/Tests/restart_eb/CMakeLists.txt b/Examples/Tests/restart_eb/CMakeLists.txt index f3664b7e1c6..54d1d3ea574 100644 --- a/Examples/Tests/restart_eb/CMakeLists.txt +++ b/Examples/Tests/restart_eb/CMakeLists.txt @@ -1,25 +1,29 @@ # Add tests (alphabetical order) ############################################## # -add_warpx_test( - test_3d_eb_picmi # name - 3 # dims - 1 # nprocs - ON # eb - inputs_test_3d_eb_picmi.py # inputs - analysis_default_regression.py # analysis - diags/diag1000060 # output - OFF # dependency -) +if(WarpX_EB) + add_warpx_test( + test_3d_eb_picmi # name + 3 # dims + 1 # nprocs + ON # eb + inputs_test_3d_eb_picmi.py # inputs + analysis_default_regression.py # analysis + diags/diag1000060 # output + OFF # dependency + ) +endif() # FIXME -#add_warpx_test( -# test_3d_eb_picmi_restart # name -# 3 # dims -# 1 # nprocs -# ON # eb -# "inputs_test_3d_eb_picmi.py amr.restart='../test_3d_eb_picmi/diags/chk000030'" # inputs -# analysis_default_restart.py # analysis -# diags/diag1000060 # output -# test_3d_eb_picmi # dependency -#) +#if(WarpX_EB) +# add_warpx_test( +# test_3d_eb_picmi_restart # name +# 3 # dims +# 1 # nprocs +# ON # eb +# "inputs_test_3d_eb_picmi.py amr.restart='../test_3d_eb_picmi/diags/chk000030'" # inputs +# analysis_default_restart.py # analysis +# diags/diag1000060 # output +# test_3d_eb_picmi # dependency +# ) +#endif() diff --git a/Examples/Tests/rigid_injection/CMakeLists.txt b/Examples/Tests/rigid_injection/CMakeLists.txt index 4fdef6a248b..210cc86418f 100644 --- a/Examples/Tests/rigid_injection/CMakeLists.txt +++ b/Examples/Tests/rigid_injection/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_rigid_injection_btd # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_rigid_injection_btd # inputs - analysis_rigid_injection_btd.py # analysis - diags/diag1000001 # output - OFF # dependency + test_2d_rigid_injection_btd # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_rigid_injection_btd # inputs + analysis_rigid_injection_btd.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_2d_rigid_injection_lab # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_rigid_injection_lab # inputs - analysis_rigid_injection_lab.py # analysis - diags/diag1000289 # output - OFF # dependency + test_2d_rigid_injection_lab # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_rigid_injection_lab # inputs + analysis_rigid_injection_lab.py # analysis + diags/diag1000289 # output + OFF # dependency ) diff --git a/Examples/Tests/scraping/CMakeLists.txt b/Examples/Tests/scraping/CMakeLists.txt index 9a936949a74..94ec04e35d7 100644 --- a/Examples/Tests/scraping/CMakeLists.txt +++ b/Examples/Tests/scraping/CMakeLists.txt @@ -3,26 +3,26 @@ if(WarpX_EB) add_warpx_test( - test_rz_scraping # name - RZ # dims + test_rz_scraping # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_scraping # inputs - analysis_rz.py # analysis - diags/diag1000037 # output - OFF # dependency + ON # eb + inputs_test_rz_scraping # inputs + analysis_rz.py # analysis + diags/diag1000037 # output + OFF # dependency ) endif() if(WarpX_EB) add_warpx_test( - test_rz_scraping_filter # name - RZ # dims + test_rz_scraping_filter # name + RZ # dims 2 # nprocs - ON # eb - inputs_test_rz_scraping_filter # inputs - analysis_rz_filter.py # analysis - diags/diag1000037 # output - OFF # dependency + ON # eb + inputs_test_rz_scraping_filter # inputs + analysis_rz_filter.py # analysis + diags/diag1000037 # output + OFF # dependency ) endif() diff --git a/Examples/Tests/silver_mueller/CMakeLists.txt b/Examples/Tests/silver_mueller/CMakeLists.txt index a9058c37f85..5b9cd278ef0 100644 --- a/Examples/Tests/silver_mueller/CMakeLists.txt +++ b/Examples/Tests/silver_mueller/CMakeLists.txt @@ -2,45 +2,45 @@ # add_warpx_test( - test_1d_silver_mueller # name - 1 # dims - 2 # nprocs - OFF # eb - inputs_test_1d_silver_mueller # inputs - analysis.py # analysis - diags/diag1000500 # output - OFF # dependency + test_1d_silver_mueller # name + 1 # dims + 2 # nprocs + OFF # eb + inputs_test_1d_silver_mueller # inputs + analysis.py # analysis + diags/diag1000500 # output + OFF # dependency ) add_warpx_test( - test_2d_silver_mueller_x # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_silver_mueller_x # inputs - analysis.py # analysis - diags/diag1000500 # output - OFF # dependency + test_2d_silver_mueller_x # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_silver_mueller_x # inputs + analysis.py # analysis + diags/diag1000500 # output + OFF # dependency ) add_warpx_test( - test_2d_silver_mueller_z # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_silver_mueller_z # inputs - analysis.py # analysis - diags/diag1000500 # output - OFF # dependency + test_2d_silver_mueller_z # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_silver_mueller_z # inputs + analysis.py # analysis + diags/diag1000500 # output + OFF # dependency ) add_warpx_test( - test_rz_silver_mueller_z # name - RZ # dims + test_rz_silver_mueller_z # name + RZ # dims 2 # nprocs - OFF # eb - inputs_test_rz_silver_mueller_z # inputs - analysis.py # analysis - diags/diag1000500 # output - OFF # dependency + OFF # eb + inputs_test_rz_silver_mueller_z # inputs + analysis.py # analysis + diags/diag1000500 # output + OFF # dependency ) diff --git a/Examples/Tests/single_particle/CMakeLists.txt b/Examples/Tests/single_particle/CMakeLists.txt index 38a9ccca3ce..b2719bee681 100644 --- a/Examples/Tests/single_particle/CMakeLists.txt +++ b/Examples/Tests/single_particle/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_bilinear_filter # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_bilinear_filter # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_2d_bilinear_filter # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_bilinear_filter # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/space_charge_initialization/CMakeLists.txt b/Examples/Tests/space_charge_initialization/CMakeLists.txt index 3d66074e70e..af07d677775 100644 --- a/Examples/Tests/space_charge_initialization/CMakeLists.txt +++ b/Examples/Tests/space_charge_initialization/CMakeLists.txt @@ -2,23 +2,23 @@ # add_warpx_test( - test_2d_space_charge_initialization # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_space_charge_initialization # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_2d_space_charge_initialization # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_space_charge_initialization # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) add_warpx_test( - test_3d_space_charge_initialization # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_space_charge_initialization # inputs - analysis.py # analysis - diags/diag1000001 # output - OFF # dependency + test_3d_space_charge_initialization # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_space_charge_initialization # inputs + analysis.py # analysis + diags/diag1000001 # output + OFF # dependency ) diff --git a/Examples/Tests/subcycling/CMakeLists.txt b/Examples/Tests/subcycling/CMakeLists.txt index f772cbee117..ccea031f5a4 100644 --- a/Examples/Tests/subcycling/CMakeLists.txt +++ b/Examples/Tests/subcycling/CMakeLists.txt @@ -2,12 +2,12 @@ # add_warpx_test( - test_2d_subcycling_mr # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_subcycling_mr # inputs - analysis_default_regression.py # analysis - diags/diag1000250 # output - OFF # dependency + test_2d_subcycling_mr # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_subcycling_mr # inputs + analysis_default_regression.py # analysis + diags/diag1000250 # output + OFF # dependency ) diff --git a/Examples/Tests/vay_deposition/CMakeLists.txt b/Examples/Tests/vay_deposition/CMakeLists.txt index e181820faa6..9ebe4ec0dba 100644 --- a/Examples/Tests/vay_deposition/CMakeLists.txt +++ b/Examples/Tests/vay_deposition/CMakeLists.txt @@ -3,26 +3,26 @@ if(WarpX_FFT) add_warpx_test( - test_2d_vay_deposition # name - 2 # dims - 2 # nprocs - OFF # eb - inputs_test_2d_vay_deposition # inputs - analysis.py # analysis - diags/diag1000050 # output - OFF # dependency + test_2d_vay_deposition # name + 2 # dims + 2 # nprocs + OFF # eb + inputs_test_2d_vay_deposition # inputs + analysis.py # analysis + diags/diag1000050 # output + OFF # dependency ) endif() if(WarpX_FFT) add_warpx_test( - test_3d_vay_deposition # name - 3 # dims - 2 # nprocs - OFF # eb - inputs_test_3d_vay_deposition # inputs - analysis.py # analysis - diags/diag1000025 # output - OFF # dependency + test_3d_vay_deposition # name + 3 # dims + 2 # nprocs + OFF # eb + inputs_test_3d_vay_deposition # inputs + analysis.py # analysis + diags/diag1000025 # output + OFF # dependency ) endif() From d63c920d81e25877bfa54d7fa8d36ee6a9379497 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 5 Sep 2024 11:48:56 -0700 Subject: [PATCH 166/167] Enable line to define `BUILD_TESTING` in CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f43465d9c50..10f4b0fb3ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ if(WarpX_HEFFTE) endif() # this defined the variable BUILD_TESTING which is ON by default -#include(CTest) +include(CTest) # Dependencies ################################################################ From 2a6496dbad5bcf7cf195ad97cf8bad64e6b5e9bd Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Thu, 5 Sep 2024 11:57:16 -0700 Subject: [PATCH 167/167] Remove repo/branch build workaround in Azure pipeline --- .azure-pipelines.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 58b7549e5e8..6e9884966fe 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -148,12 +148,9 @@ jobs: # configure export AMReX_CMAKE_FLAGS="-DAMReX_ASSERTIONS=ON -DAMReX_TESTING=ON" - # FIXME update after https://github.com/AMReX-Codes/amrex/pull/4126 cmake -S . -B build \ ${AMReX_CMAKE_FLAGS} \ ${WARPX_CMAKE_FLAGS} \ - -DWarpX_amrex_repo=https://github.com/ax3l/amrex.git \ - -DWarpX_amrex_branch=topic-pp-prefix \ -DWarpX_TEST_CLEANUP=ON \ -DWarpX_TEST_FPETRAP=ON