diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 190294bb0e1..e6ba115925a 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -115,7 +115,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd ../amrex && git checkout --detach 24.07 && cd - + cd ../amrex && git checkout --detach dcb9cc0383dcc71e38dee9070574e325a812f8bf && cd - make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4 ccache -s diff --git a/Docs/requirements.txt b/Docs/requirements.txt index b16bf161144..1ce1ee6c1a0 100644 --- a/Docs/requirements.txt +++ b/Docs/requirements.txt @@ -13,7 +13,7 @@ openpmd-viewer # for checksumAPI # PICMI API docs # note: keep in sync with version in ../requirements.txt -picmistandard==0.28.0 +picmistandard==0.29.0 # for development against an unreleased PICMI version, use: # picmistandard @ git+https://github.com/picmi-standard/picmi.git#subdirectory=PICMI_Python diff --git a/Docs/source/usage/parameters.rst b/Docs/source/usage/parameters.rst index 3cc05caa4d9..c24b3451d04 100644 --- a/Docs/source/usage/parameters.rst +++ b/Docs/source/usage/parameters.rst @@ -508,7 +508,7 @@ Domain Boundary Conditions * ``open``: For the electrostatic Poisson solver based on a Integrated Green Function method. * ``boundary.potential_lo_x/y/z`` and ``boundary.potential_hi_x/y/z`` (default `0`) - Gives the value of the electric potential at the boundaries, for ``pec`` boundaries. With electrostatic solvers + Gives the value of the electric potential, in Volts, at the boundaries, for ``pec`` boundaries. With electrostatic solvers (i.e., with ``warpx.do_electrostatic = ...``), this is used in order to compute the potential in the simulation volume at each timestep. When using other solvers (e.g. Maxwell solver), setting these variables will trigger an electrostatic solve at ``t=0``, to compute the initial @@ -611,7 +611,7 @@ Whether the embedded boundary is defined with an analytical function or an STL f additionally define the electric potential at the embedded boundary with an analytical function: * ``warpx.eb_potential(x,y,z,t)`` (`string`) - Gives the value of the electric potential at the surface of the embedded boundary, + Gives the value of the electric potential, in Volts, at the surface of the embedded boundary, as a function of `x`, `y`, `z` and `t`. With electrostatic solvers (i.e., with ``warpx.do_electrostatic = ...``), this is used in order to compute the potential in the simulation volume at each timestep. When using other solvers (e.g. Maxwell solver), @@ -1164,8 +1164,8 @@ Particle initialization * ``gaussian_parse_momentum_function``: Gaussian momentum distribution where the mean and the standard deviation are given by functions of position in the input file. Both are assumed to be non-relativistic. The mean is the normalized momentum, :math:`u_m = \gamma v_m/c`. - The standard deviation is normalized, :math:`u_th = v_th/c`. - For example, this might be `u_th = sqrt(T*q_e/mass)/clight` given the temperature (in eV) and mass. + The standard deviation is normalized, :math:`u_{th} = v_{th}/c`. + For example, this might be ``u_th = sqrt(T*q_e/mass)/clight`` given the temperature (in eV) and mass. It requires the following arguments: * ``.momentum_function_ux_m(x,y,z)``: mean :math:`u_{x}` diff --git a/Examples/Tests/collision/analysis_collision_3d.py b/Examples/Tests/collision/analysis_collision_3d.py index ee0c81d8f75..86a434caab2 100755 --- a/Examples/Tests/collision/analysis_collision_3d.py +++ b/Examples/Tests/collision/analysis_collision_3d.py @@ -111,4 +111,4 @@ dim, species_name) test_name = os.path.split(os.getcwd())[1] -checksumAPI.evaluate_checksum(test_name, fn, do_particles=False) +checksumAPI.evaluate_checksum(test_name, fn) diff --git a/Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py b/Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py index 70178fe97a6..858df0b26a6 100755 --- a/Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py +++ b/Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py @@ -47,7 +47,9 @@ sigma_th = 2.603e-18 error = np.abs(sigma-sigma_th)/sigma_th -tolerance = 1e-2 +tolerance = 2e-2 +print('error = ', error) +print('tolerance = ', tolerance) assert error < tolerance # Compare checksums with benchmark diff --git a/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies b/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies index 985cc2d7612..0030ca9b945 100644 --- a/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies +++ b/Examples/Tests/nuclear_fusion/inputs_deuterium_deuterium_3d_intraspecies @@ -8,6 +8,8 @@ # plasma simulations. Journal of Computational Physics, 388, pp.439-453. # DOI: https://doi.org/10.1016/j.jcp.2019.03.020 +warpx.random_seed = 1034958209 + # algo algo.particle_shape = 3 diff --git a/Python/setup.py b/Python/setup.py index e4adbb6c458..31f35eeceac 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -59,7 +59,7 @@ package_dir = {'pywarpx': 'pywarpx'}, description = """Wrapper of WarpX""", package_data = package_data, - install_requires = ['numpy', 'picmistandard==0.28.0', 'periodictable'], + install_requires = ['numpy', 'picmistandard==0.29.0', 'periodictable'], python_requires = '>=3.8', zip_safe=False ) diff --git a/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json b/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json index 59818f62826..45e29874cda 100644 --- a/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json +++ b/Regression/Checksum/benchmarks_json/Deuterium_Deuterium_Fusion_3D_intraspecies.json @@ -1,34 +1,34 @@ { "lev=0": { "rho": 0.0, - "rho_deuterium": 8203144355.71195, - "rho_helium3": 10.368009592276463 + "rho_deuterium": 8203144355.767546, + "rho_helium3": 10.312416024595505 }, "neutron": { - "particle_momentum_x": 2.2543499835759282e-15, - "particle_momentum_y": 2.2526527390783875e-15, - "particle_momentum_z": 2.2619641737859965e-15, - "particle_position_x": 61.961041864660686, - "particle_position_y": 61.78141653674165, - "particle_position_z": 61.741022731492514, - "particle_weight": 505562702.7678892 + "particle_momentum_x": 2.260586487910896e-15, + "particle_momentum_y": 2.2564723094408887e-15, + "particle_momentum_z": 2.263164930227645e-15, + "particle_position_x": 62.03084683414219, + "particle_position_y": 61.95011296352698, + "particle_position_z": 62.02404756675538, + "particle_weight": 502851860.91505826 }, "deuterium": { - "particle_momentum_x": 1.3370046499332103e-14, - "particle_momentum_y": 1.3364310231320824e-14, - "particle_momentum_z": 1.3372728873714894e-14, - "particle_position_x": 2560.1613417364665, - "particle_position_y": 2560.082464065988, - "particle_position_z": 2560.0018477161034, - "particle_weight": 7.999999989888742e+17 + "particle_momentum_x": 1.3380470537895298e-14, + "particle_momentum_y": 1.3367685546044215e-14, + "particle_momentum_z": 1.3372922616599391e-14, + "particle_position_x": 2559.782513518522, + "particle_position_y": 2559.8747993471684, + "particle_position_z": 2560.2864832238383, + "particle_weight": 7.999999989942968e+17 }, "helium3": { - "particle_momentum_x": 2.2749239620327265e-15, - "particle_momentum_y": 2.268697031603961e-15, - "particle_momentum_z": 2.278045756364995e-15, - "particle_position_x": 61.961041864660686, - "particle_position_y": 61.78141653674165, - "particle_position_z": 61.741022731492514, - "particle_weight": 505562702.7678892 + "particle_momentum_x": 2.278275200450756e-15, + "particle_momentum_y": 2.2738610200497133e-15, + "particle_momentum_z": 2.2792408973056887e-15, + "particle_position_x": 62.03084683414219, + "particle_position_y": 61.95011296352698, + "particle_position_z": 62.02404756675538, + "particle_weight": 502851860.91505826 } -} \ No newline at end of file +} diff --git a/Regression/Checksum/benchmarks_json/collisionISO.json b/Regression/Checksum/benchmarks_json/collisionISO.json index 5146837be6f..a2fd6116cb8 100644 --- a/Regression/Checksum/benchmarks_json/collisionISO.json +++ b/Regression/Checksum/benchmarks_json/collisionISO.json @@ -11,12 +11,12 @@ "jz": 0.0 }, "electron": { - "particle_momentum_x": 3.579130200773753e-19, - "particle_momentum_y": 3.5788119408700804e-19, - "particle_momentum_z": 3.584163522201744e-19, - "particle_position_x": 1.024188253213835, - "particle_position_y": 1.0238795904737117, - "particle_position_z": 1.02399735048655, + "particle_momentum_x": 3.579989064013309e-19, + "particle_momentum_y": 3.5822945977746767e-19, + "particle_momentum_z": 3.579753452653627e-19, + "particle_position_x": 1.0241322532163375, + "particle_position_y": 1.0238995904625479, + "particle_position_z": 1.02402135051502, "particle_weight": 714240000000.0 } } diff --git a/Regression/Checksum/benchmarks_json/collisionXYZ.json b/Regression/Checksum/benchmarks_json/collisionXYZ.json index 7436302a99e..39df1b9eee1 100644 --- a/Regression/Checksum/benchmarks_json/collisionXYZ.json +++ b/Regression/Checksum/benchmarks_json/collisionXYZ.json @@ -6,7 +6,25 @@ "Ex": 0.0, "Ey": 0.0, "Ez": 0.0, - "T_electron": 351570.64632548566, - "T_ion": 350085.3998917431 + "T_electron": 353604.6247926339, + "T_ion": 347976.6168136309 + }, + "electron": { + "particle_momentum_x": 8.370755929299189e-19, + "particle_momentum_y": 8.228112213603589e-19, + "particle_momentum_z": 8.204295817378347e-19, + "particle_position_x": 21284971.94721422, + "particle_position_y": 21212829.42991966, + "particle_position_z": 21214774.536558084, + "particle_weight": 7.168263344048695e+28 + }, + "ion": { + "particle_momentum_x": 2.0074097598289766e-18, + "particle_momentum_y": 1.8203553942782305e-18, + "particle_momentum_z": 1.823420185235695e-18, + "particle_position_x": 21227192.857240494, + "particle_position_y": 21286501.692027714, + "particle_position_z": 21245587.6706009, + "particle_weight": 7.168263344048695e+28 } } diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini index 0003dcff134..b32ca61c709 100644 --- a/Regression/WarpX-GPU-tests.ini +++ b/Regression/WarpX-GPU-tests.ini @@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more [AMReX] dir = /home/regtester/git/amrex/ -branch = 24.07 +branch = dcb9cc0383dcc71e38dee9070574e325a812f8bf [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 99362f895c3..8023a923c59 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 = 24.07 +branch = dcb9cc0383dcc71e38dee9070574e325a812f8bf [source] dir = /home/regtester/AMReX_RegTesting/warpx @@ -81,10 +81,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_2d_psatd_hybrid] @@ -99,10 +95,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_3d_psatd] @@ -117,10 +109,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [averaged_galilean_3d_psatd_hybrid] @@ -135,10 +123,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [background_mcc] @@ -153,10 +137,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons he_ions analysisRoutine = Examples/analysis_default_regression.py [background_mcc_dp_psp] @@ -171,10 +151,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons he_ions analysisRoutine = Examples/analysis_default_regression.py [bilinear_filter] @@ -189,8 +165,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/single_particle/analysis_bilinear_filter.py [BTD_rz] @@ -205,8 +179,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/btd_rz/analysis_BTD_laser_antenna.py [collider_diagnostics] @@ -221,8 +193,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/collider_relevant_diags/analysis_multiple_particles.py [collisionISO] @@ -237,8 +207,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/collision/analysis_collision_3d_isotropization.py aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -254,9 +222,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/collision/analysis_collision_rz.py aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -272,9 +237,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/collision/analysis_collision_3d.py aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -290,9 +252,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/collision/analysis_collision_2d.py aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -308,10 +267,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions beam analysisRoutine = Examples/analysis_default_regression.py [Deuterium_Deuterium_Fusion_3D] @@ -326,8 +281,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py [Deuterium_Deuterium_Fusion_3D_intraspecies] @@ -342,8 +295,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_deuterium_deuterium_3d_intraspecies.py [Deuterium_Tritium_Fusion_3D] @@ -358,8 +309,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py [Deuterium_Tritium_Fusion_RZ] @@ -374,8 +323,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_two_product_fusion.py [dirichletbc] @@ -390,9 +337,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_dirichlet_bc/analysis.py [divb_cleaning_3d] @@ -407,9 +351,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/divb_cleaning/analysis.py [dive_cleaning_2d] @@ -423,9 +364,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = geometry.dims=2 analysisRoutine = Examples/Tests/dive_cleaning/analysis.py analysisOutputImage = Comparison.png @@ -441,9 +379,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = analysisRoutine = Examples/Tests/dive_cleaning/analysis.py analysisOutputImage = Comparison.png @@ -460,9 +395,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py [ElectrostaticSphereLabFrame_MR_emass_10] @@ -477,9 +409,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py [ElectrostaticSphereEB] @@ -494,9 +423,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis.py [ElectrostaticSphereEB_mixedBCs] @@ -511,9 +437,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [EmbeddedBoundaryDiffraction] @@ -528,9 +451,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 outputFile = EmbeddedBoundaryDiffraction_plt analysisRoutine = Examples/Tests/embedded_boundary_diffraction/analysis_fields.py @@ -546,9 +466,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis_rz.py [ElectrostaticSphereEB_RZ_MR] @@ -563,9 +480,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis_rz.py [ElectrostaticSphereLabFrame] @@ -580,9 +494,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py [ElectrostaticSphereRZ] @@ -597,9 +508,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py [ElectrostaticSphereRelNodal] @@ -614,9 +522,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere/analysis_electrostatic_sphere.py [embedded_boundary_cube] @@ -631,9 +536,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_cube/analysis_fields.py [embedded_boundary_cube_2d] @@ -648,9 +550,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_cube/analysis_fields_2d.py [embedded_boundary_cube_macroscopic] @@ -665,9 +564,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_cube/analysis_fields.py [embedded_boundary_python_API] @@ -684,9 +580,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_python_api/analysis.py [embedded_boundary_rotated_cube] @@ -701,9 +594,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_rotated_cube/analysis_fields.py [embedded_boundary_rotated_cube_2d] @@ -718,9 +608,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/embedded_boundary_rotated_cube/analysis_fields_2d.py [embedded_circle] @@ -735,10 +622,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ar_ions analysisRoutine = Examples/Tests/embedded_circle/analysis.py [FieldProbe] @@ -753,9 +636,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/field_probe/analysis_field_probe.py [FluxInjection] @@ -770,10 +650,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron analysisRoutine = Examples/Tests/flux_injection/analysis_flux_injection_rz.py [FluxInjection3D] @@ -788,9 +664,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/flux_injection/analysis_flux_injection_3d.py [galilean_2d_psatd] @@ -805,10 +678,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_2d_psatd_current_correction] @@ -823,10 +692,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_2d_psatd_current_correction_psb] @@ -841,10 +706,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_2d_psatd_hybrid] @@ -859,10 +720,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions beam analysisRoutine = Examples/analysis_default_regression.py [galilean_3d_psatd] @@ -877,10 +734,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_3d_psatd_current_correction] @@ -895,10 +748,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_3d_psatd_current_correction_psb] @@ -913,10 +762,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_rz_psatd] @@ -931,10 +776,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_rz_psatd_current_correction_psb] @@ -949,10 +790,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [galilean_rz_psatd_current_correction] @@ -967,10 +804,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_galilean.py [hard_edged_plasma_lens] @@ -985,10 +818,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/plasma_lens/analysis.py [hard_edged_quadrupoles] @@ -1003,10 +832,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron analysisRoutine = Examples/Tests/AcceleratorLattice/analysis.py [hard_edged_quadrupoles_boosted] @@ -1021,10 +846,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron analysisRoutine = Examples/Tests/AcceleratorLattice/analysis.py [hard_edged_quadrupoles_moving] @@ -1039,10 +860,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron analysisRoutine = Examples/Tests/AcceleratorLattice/analysis.py [initial_distribution] @@ -1057,9 +874,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/initial_distribution/analysis_distribution.py aux1File = Tools/PostProcessing/read_raw_data.py @@ -1075,8 +889,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/ionization/analysis_ionization.py [ionization_lab] @@ -1091,8 +903,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/ionization/analysis_ionization.py [ion_stopping] @@ -1107,9 +917,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ion_stopping/analysis_ion_stopping.py [Langmuir_multi] @@ -1124,10 +931,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1143,9 +946,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_1d.py analysisOutputImage = langmuir_fluid_multi_1d_analysis.png @@ -1161,9 +961,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_rz.py analysisOutputImage = langmuir_fluid_rz_analysis.png @@ -1179,9 +976,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_2d.py analysisOutputImage = langmuir_fluid_multi_2d_analysis.png @@ -1197,9 +991,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/langmuir_fluids/analysis_3d.py analysisOutputImage = langmuir_fluid_multi_analysis.png @@ -1215,10 +1006,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_1d.py analysisOutputImage = langmuir_multi_1d_analysis.png @@ -1234,10 +1021,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_MR.png @@ -1253,10 +1036,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_MR.png @@ -1272,10 +1051,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_MR_momentum_conserving.png @@ -1291,10 +1066,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_MR_psatd.png @@ -1310,10 +1081,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1329,10 +1096,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1348,10 +1111,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1367,10 +1126,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1386,10 +1141,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1405,10 +1156,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_psatd_multiJ.png @@ -1424,10 +1171,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = Langmuir_multi_2d_psatd_multiJ_nodal.png @@ -1443,10 +1186,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1462,10 +1201,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1481,10 +1216,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png @@ -1500,16 +1231,12 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_2d.py analysisOutputImage = langmuir_multi_2d_analysis.png [Langmuir_multi_nodal] buildDir = . -inputFile = +inputFile = Examples/Tests/langmuir/inputs_3d runtime_params = warpx.grid_type=collocated algo.current_deposition=direct dim = 3 addToCompileString = @@ -1519,10 +1246,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1538,10 +1261,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1557,10 +1276,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1576,10 +1291,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1595,10 +1306,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1614,10 +1321,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1633,10 +1336,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = Langmuir_multi_psatd_multiJ.png @@ -1652,10 +1351,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = Langmuir_multi_psatd_multiJ_nodal.png @@ -1671,10 +1366,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1690,10 +1381,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1709,10 +1396,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1728,10 +1411,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1747,10 +1426,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/langmuir/analysis_rz.py analysisOutputImage = Langmuir_multi_rz_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -1767,10 +1442,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/langmuir/analysis_rz.py analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -1787,10 +1458,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/langmuir/analysis_rz.py analysisOutputImage = Langmuir_multi_rz_psatd_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -1807,10 +1474,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/langmuir/analysis_rz.py analysisOutputImage = Langmuir_multi_rz_psatd_multiJ_analysis.png aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -1827,10 +1490,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons positrons analysisRoutine = Examples/Tests/langmuir/analysis_3d.py analysisOutputImage = langmuir_multi_analysis.png @@ -1846,8 +1505,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [LaserAcceleration] @@ -1862,10 +1519,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons outputFile = LaserAcceleration_plt analysisRoutine = Examples/analysis_default_openpmd_regression.py @@ -1881,10 +1534,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [LaserAcceleration_1d_fluid] @@ -1899,10 +1548,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Physics_applications/laser_acceleration/analysis_1d_fluids.py [LaserAcceleration_1d_fluid_boosted] @@ -1917,10 +1562,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Physics_applications/laser_acceleration/analysis_1d_fluids_boosted.py [LaserAccelerationBoost] @@ -1935,8 +1576,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [LaserAcceleration_BTD] @@ -1951,10 +1590,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -doComparison = 0 analysisRoutine = Examples/Tests/boosted_diags/analysis.py [LaserAccelerationMR] @@ -1969,10 +1604,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons beam analysisRoutine = Examples/analysis_default_regression.py [LaserAccelerationRZ] @@ -1987,10 +1618,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons beam analysisRoutine = Examples/analysis_default_regression.py [LaserAccelerationRZ_opmd] @@ -2005,10 +1632,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons beam outputFile = LaserAccelerationRZ_opmd_plt analysisRoutine = Examples/Tests/openpmd_rz/analysis_openpmd_rz.py @@ -2024,10 +1647,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons outputFile = LaserAcceleration_single_precision_comms_plt analysisRoutine = Examples/analysis_default_openpmd_regression.py @@ -2043,9 +1662,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/laser_injection/analysis_laser.py analysisOutputImage = laser_analysis.png @@ -2061,9 +1677,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/laser_injection/analysis_1d.py [LaserInjection_2d] @@ -2078,9 +1691,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/laser_injection/analysis_2d.py [LaserInjectionFromBINARYFile] @@ -2097,10 +1707,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromLASYFile] buildDir = . @@ -2116,10 +1724,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromLASYFile_1d] buildDir = . @@ -2135,10 +1741,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromLASYFile_1d_boost] buildDir = . @@ -2154,10 +1758,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromLASYFile_2d] buildDir = . @@ -2173,10 +1775,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromLASYFile_RZ] buildDir = . @@ -2192,10 +1792,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserInjectionFromRZLASYFile] buildDir = . @@ -2211,10 +1809,8 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 selfTest = 1 stSuccessString = Passed -doVis = 0 [LaserIonAcc2d] buildDir = . @@ -2229,8 +1825,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_openpmd_regression.py [LaserOnFine] @@ -2245,8 +1839,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [leveling_thinning] @@ -2261,9 +1853,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/resampling/analysis_leveling_thinning.py [LoadExternalFieldRZGrid] @@ -2279,10 +1868,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = proton analysisRoutine = Examples/Tests/LoadExternalField/analysis_rz.py [LoadExternalFieldRZParticles] @@ -2298,10 +1883,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = proton analysisRoutine = Examples/Tests/LoadExternalField/analysis_rz.py [magnetostatic_eb_3d] @@ -2316,9 +1897,6 @@ useMPI = 1 numprocs = 1 useOMP = 2 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [Maxwell_Hybrid_QED_solver] @@ -2333,8 +1911,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/maxwell_hybrid_qed/analysis_Maxwell_QED_Hybrid.py [momentum-conserving-gather] @@ -2349,10 +1925,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = beam driver plasma_e analysisRoutine = Examples/analysis_default_regression.py [multi_J_rz_psatd] @@ -2367,10 +1939,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = driver plasma_e plasma_p analysisRoutine = Examples/analysis_default_regression.py [nci_corrector] @@ -2385,9 +1953,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -doComparison = 0 analysisRoutine = Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py [nci_correctorMR] @@ -2402,9 +1967,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -doComparison = 0 analysisRoutine = Examples/Tests/nci_fdtd_stability/analysis_ncicorr.py [parabolic_channel_initialization_2d_single_precision] @@ -2418,9 +1980,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = analysisRoutine = Examples/Tests/initial_plasma_profile/analysis.py @@ -2436,10 +1995,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/particle_boundary_process/analysis_absorption.py [particle_boundaries_3d] @@ -2454,9 +2009,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/boundaries/analysis.py [particle_fields_diags] @@ -2472,9 +2024,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particle_fields_diags/analysis_particle_diags.py [particle_fields_diags_single_precision] @@ -2490,9 +2039,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particle_fields_diags/analysis_particle_diags_single.py [particle_pusher] @@ -2507,9 +2053,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particle_pusher/analysis_pusher.py [particle_scrape] @@ -2524,10 +2067,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/particle_boundary_scrape/analysis_scrape.py [particles_in_pml] @@ -2542,9 +2081,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particles_in_pml/analysis_particles_in_pml.py [particles_in_pml_2d] @@ -2559,9 +2095,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particles_in_pml/analysis_particles_in_pml.py [particles_in_pml_2d_MR] @@ -2576,9 +2109,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particles_in_pml/analysis_particles_in_pml.py [particles_in_pml_3d_MR] @@ -2593,9 +2123,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particles_in_pml/analysis_particles_in_pml.py [PEC_field] @@ -2610,9 +2137,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/pec/analysis_pec.py [PEC_field_mr] @@ -2627,9 +2151,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/pec/analysis_pec_mr.py [PEC_particle] @@ -2644,10 +2165,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron proton analysisRoutine = Examples/analysis_default_regression.py [Performance_works_1_uniform_rest_32ppc] @@ -2662,10 +2179,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = [Performance_works_2_uniform_rest_1ppc] @@ -2680,10 +2193,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = [Performance_works_3_uniform_drift_4ppc] @@ -2698,10 +2207,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = [Performance_works_4_labdiags_2ppc] @@ -2716,10 +2221,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = [Performance_works_5_loadimbalance] @@ -2734,10 +2235,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = [Performance_works_6_output_2ppc] @@ -2752,10 +2249,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = [photon_pusher] @@ -2770,9 +2263,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/photon_pusher/analysis_photon_pusher.py [PlasmaAccelerationBoost2d] @@ -2787,8 +2277,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [PlasmaAccelerationBoost3d] @@ -2803,8 +2291,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [PlasmaAccelerationBoost3d_hybrid] @@ -2818,8 +2304,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [PlasmaAccelerationMR] @@ -2834,10 +2318,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = beam driver plasma_e analysisRoutine = Examples/analysis_default_regression.py [Plasma_lens] @@ -2852,10 +2332,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/plasma_lens/analysis.py [Plasma_lens_boosted] @@ -2869,11 +2345,7 @@ restartTest = 0 useMPI = 1 numprocs = 2 useOMP = 1 -numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons +numthreads = 1 analysisRoutine = Examples/Tests/plasma_lens/analysis.py [Plasma_lens_short] @@ -2888,10 +2360,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/plasma_lens/analysis.py [PlasmaMirror] @@ -2906,8 +2374,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [pml_psatd_dive_divb_cleaning] @@ -2922,8 +2388,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [pml_psatd_rz] @@ -2938,8 +2402,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_psatd_rz.py [pml_x_ckc] @@ -2954,8 +2416,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_ckc.py [pml_x_galilean] @@ -2970,8 +2430,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_psatd.py [pml_x_psatd] @@ -2987,8 +2445,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_psatd.py [pml_x_yee] @@ -3004,8 +2460,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_yee.py [pml_x_yee_eb] @@ -3021,8 +2475,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/pml/analysis_pml_yee.py [Proton_Boron_Fusion_2D] @@ -3037,8 +2489,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py [Proton_Boron_Fusion_3D] @@ -3053,8 +2503,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/nuclear_fusion/analysis_proton_boron_fusion.py [Python_background_mcc] @@ -3071,9 +2519,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Physics_applications/capacitive_discharge/analysis_2d.py [Python_background_mcc_1d] @@ -3090,9 +2535,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Physics_applications/capacitive_discharge/analysis_1d.py [Python_background_mcc_1d_tridiag] @@ -3109,9 +2551,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Physics_applications/capacitive_discharge/analysis_1d.py [Python_collisionXZ] @@ -3128,9 +2567,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/collision/analysis_collision_2d.py aux1File = Regression/PostProcessingUtils/post_processing_utils.py @@ -3148,9 +2584,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_dirichlet_bc/analysis.py [Python_dsmc_1d] @@ -3167,9 +2600,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Physics_applications/capacitive_discharge/analysis_dsmc.py [Python_ElectrostaticSphereEB] @@ -3186,9 +2616,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/electrostatic_sphere_eb/analysis.py [Python_gaussian_beam] @@ -3205,10 +2632,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_gaussian_beam_no_field_output] @@ -3225,10 +2648,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = [Python_gaussian_beam_opmd] @@ -3245,10 +2664,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = [Python_gaussian_beam_opmd_no_field_output] @@ -3265,10 +2680,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = [Python_id_cpu_read] @@ -3285,10 +2696,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons [Python_ionization] buildDir = . @@ -3304,8 +2711,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/ionization/analysis_ionization.py [Python_Langmuir] @@ -3322,10 +2727,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_Langmuir_2d] @@ -3342,10 +2743,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_Langmuir_rz_multimode] @@ -3362,10 +2759,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons protons analysisRoutine = Examples/analysis_default_regression.py [Python_LaserAcceleration] @@ -3382,10 +2775,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_LaserAcceleration_1d] @@ -3402,10 +2791,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_LaserAccelerationMR] @@ -3422,10 +2807,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons beam analysisRoutine = Examples/analysis_default_regression.py [Python_LaserAccelerationRZ] @@ -3442,10 +2823,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons beam analysisRoutine = Examples/analysis_default_regression.py [Python_LaserIonAcc2d] @@ -3463,8 +2840,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_openpmd_regression.py [Python_LoadExternalGridField3D] @@ -3481,10 +2856,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = proton analysisRoutine = Examples/Tests/LoadExternalField/analysis_3d.py [Python_LoadExternalParticleField3D] @@ -3501,10 +2872,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = proton analysisRoutine = Examples/Tests/LoadExternalField/analysis_3d.py [Python_magnetostatic_eb_3d] @@ -3521,10 +2888,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 2 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons analysisRoutine = Examples/analysis_default_regression.py [Python_magnetostatic_eb_rz] @@ -3541,10 +2904,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 2 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons analysisRoutine = Examples/Tests/magnetostatic_eb/analysis_rz.py [Python_ohms_law_solver_EM_modes_1d] @@ -3561,9 +2920,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ohm_solver_EM_modes/analysis.py [Python_ohms_law_solver_EM_modes_rz] @@ -3571,7 +2927,7 @@ buildDir = . inputFile = Examples/Tests/ohm_solver_EM_modes/PICMI_inputs_rz.py runtime_params = warpx.abort_on_warning_threshold = medium customRunCmd = python3 PICMI_inputs_rz.py --test -dim = 1 +dim = 2 addToCompileString = USE_PYTHON_MAIN=TRUE USE_OPENPMD=TRUE QED=FALSE USE_RZ=TRUE cmakeSetupOpts = -DWarpX_DIMS=RZ -DWarpX_APP=OFF -DWarpX_QED=OFF -DWarpX_PYTHON=ON target = pip_install @@ -3580,9 +2936,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ohm_solver_EM_modes/analysis_rz.py [Python_ohms_law_solver_ion_beam_1d] @@ -3599,9 +2952,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ohm_solver_ion_beam_instability/analysis.py [Python_ohms_law_solver_landau_damping_2d] @@ -3618,9 +2968,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ohm_solver_ion_Landau_damping/analysis.py [Python_ohms_law_solver_magnetic_reconnection_2d] @@ -3637,9 +2984,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/ohm_solver_magnetic_reconnection/analysis.py [Python_particle_attr_access] @@ -3656,8 +3000,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/particle_data_python/analysis.py [Python_particle_attr_access_unique] @@ -3674,8 +3016,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/particle_data_python/analysis.py [Python_particle_reflection] @@ -3692,8 +3032,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/particle_boundary_process/analysis_reflection.py [Python_particle_scrape] @@ -3710,10 +3048,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/particle_boundary_scrape/analysis_scrape.py # TODO: Enable in pyAMReX, then enable lines in PICMI_inputs_2d.py again @@ -3732,10 +3066,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons # TODO: comment in again once enabled #analysisRoutine = Examples/Tests/pass_mpi_communicator/analysis.py @@ -3753,10 +3083,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = beam analysisRoutine = Examples/analysis_default_regression.py [Python_PlasmaAcceleration1d] @@ -3773,10 +3099,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = beam analysisRoutine = Examples/analysis_default_regression.py [Python_PlasmaAccelerationMR] @@ -3793,10 +3115,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = beam analysisRoutine = Examples/analysis_default_regression.py [Python_plasma_lens] @@ -3813,10 +3131,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/plasma_lens/analysis.py [Python_prev_positions] @@ -3833,9 +3147,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/analysis_default_regression.py [Python_reduced_diags_loadbalancecosts_timers] @@ -3852,9 +3163,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py [Python_restart_eb] @@ -3872,10 +3180,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons analysisRoutine = Examples/Tests/restart/analysis_restart.py [Python_restart_runtime_components] @@ -3893,10 +3197,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons [Python_wrappers] buildDir = . @@ -3912,9 +3212,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [qed_breit_wheeler_2d] @@ -3930,9 +3227,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/qed/breit_wheeler/analysis_yt.py [qed_breit_wheeler_2d_opmd] @@ -3948,9 +3242,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 outputFile = qed_breit_wheeler_2d_opmd_plt analysisRoutine = Examples/Tests/qed/breit_wheeler/analysis_opmd.py @@ -3967,9 +3258,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/qed/breit_wheeler/analysis_yt.py [qed_breit_wheeler_3d_opmd] @@ -3985,9 +3273,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 outputFile = qed_breit_wheeler_3d_opmd_plt analysisRoutine = Examples/Tests/qed/breit_wheeler/analysis_opmd.py @@ -4003,9 +3288,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/qed/quantum_synchrotron/analysis.py [qed_quantum_sync_3d] @@ -4020,9 +3302,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/qed/quantum_synchrotron/analysis.py [qed_schwinger1] @@ -4037,8 +3316,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/qed/schwinger/analysis_schwinger.py [qed_schwinger2] @@ -4053,8 +3330,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/qed/schwinger/analysis_schwinger.py [qed_schwinger3] @@ -4069,8 +3344,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/qed/schwinger/analysis_schwinger.py [qed_schwinger4] @@ -4085,8 +3358,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/qed/schwinger/analysis_schwinger.py [radiation_reaction] @@ -4101,9 +3372,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/radiation_reaction/test_const_B_analytical/analysis_classicalRR.py [reduced_diags] @@ -4119,9 +3387,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags.py [reduced_diags_loadbalancecosts_heuristic] @@ -4136,9 +3401,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py [reduced_diags_loadbalancecosts_timers] @@ -4153,9 +3415,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py [reduced_diags_loadbalancecosts_timers_psatd] @@ -4170,9 +3429,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags_loadbalancecosts.py [reduced_diags_single_precision] @@ -4188,9 +3444,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/reduced_diags/analysis_reduced_diags_single.py [RefinedInjection] @@ -4205,10 +3458,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons beam analysisRoutine = Examples/Physics_applications/laser_acceleration/analysis_refined_injection.py [relativistic_space_charge_initialization] @@ -4222,9 +3471,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = analysisRoutine = Examples/Tests/relativistic_space_charge_initialization/analysis.py analysisOutputImage = Comparison.png @@ -4241,8 +3487,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/repelling_particles/analysis_repelling.py [resample_velocity_coincidence_thinning] @@ -4257,9 +3501,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [resample_velocity_coincidence_thinning_cartesian] @@ -4274,9 +3515,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [restart] @@ -4292,10 +3530,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = beam analysisRoutine = Examples/Tests/restart/analysis_restart.py [restart_psatd] @@ -4311,10 +3545,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = beam analysisRoutine = Examples/Tests/restart/analysis_restart.py [restart_psatd_time_avg] @@ -4330,10 +3560,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = beam analysisRoutine = Examples/Tests/restart/analysis_restart.py [RigidInjection_BTD] @@ -4348,10 +3574,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -doComparison = 0 analysisRoutine = Examples/Tests/rigid_injection/analysis_rigid_injection_BoostedFrame.py [RigidInjection_lab] @@ -4366,9 +3588,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/rigid_injection/analysis_rigid_injection_LabFrame.py [scraping] @@ -4383,9 +3602,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/scraping/analysis_rz.py [scraping_filter] @@ -4400,9 +3616,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/scraping/analysis_rz_filter.py [silver_mueller_1d] @@ -4417,8 +3630,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/silver_mueller/analysis_silver_mueller.py [silver_mueller_2d_x] @@ -4433,8 +3644,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/silver_mueller/analysis_silver_mueller.py [silver_mueller_2d_z] @@ -4449,8 +3658,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/silver_mueller/analysis_silver_mueller.py [silver_mueller_rz_z] @@ -4465,8 +3672,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/Tests/silver_mueller/analysis_silver_mueller.py [space_charge_initialization] @@ -4480,9 +3685,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = analysisRoutine = Examples/Tests/space_charge_initialization/analysis.py analysisOutputImage = Comparison.png @@ -4498,9 +3700,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 runtime_params = geometry.dims=2 analysisRoutine = Examples/Tests/space_charge_initialization/analysis.py analysisOutputImage = Comparison.png @@ -4517,9 +3716,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/analysis_default_regression.py [Uniform_2d] @@ -4534,8 +3730,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 analysisRoutine = Examples/analysis_default_regression.py [uniform_plasma_restart] @@ -4551,10 +3745,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons analysisRoutine = Examples/Tests/restart/analysis_restart.py [uniform_plasma_multiJ] @@ -4569,10 +3759,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons ions analysisRoutine = Examples/Tests/nci_psatd_stability/analysis_multiJ.py [VayDeposition2D] @@ -4587,10 +3773,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron ion analysisRoutine = Examples/Tests/vay_deposition/analysis.py [VayDeposition3D] @@ -4605,10 +3787,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electron ion analysisRoutine = Examples/Tests/vay_deposition/analysis.py [NodalElectrostaticSolver] @@ -4623,9 +3801,6 @@ useMPI = 1 numprocs = 1 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/nodal_electrostatic/analysis_3d.py [BeamBeamCollision] @@ -4640,8 +3815,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 outputFile = BeamBeamCollision_plt analysisRoutine = Examples/analysis_default_openpmd_regression.py @@ -4659,10 +3832,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons protons outputFile = spacecraft_charging_plt analysisRoutine = Examples/Physics_applications/spacecraft_charging/analysis.py analysisOutputImage = min_phi_analysis.png @@ -4679,10 +3848,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons outputFile = Point_of_contact_EB_3d_plt analysisRoutine = Examples/Tests/point_of_contact_EB/analysis.py @@ -4698,10 +3863,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -particleTypes = electrons outputFile = Point_of_contact_EB_rz_plt analysisRoutine = Examples/Tests/point_of_contact_EB/analysis.py @@ -4717,9 +3878,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/Implicit/analysis_1d.py [ThetaImplicitJFNK_VandB_2d] @@ -4734,9 +3892,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/Implicit/analysis_vandb_jfnk_2d.py [StrangImplicitPicard_2d] @@ -4768,9 +3923,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/Implicit/analysis_1d.py [EnergyConservingThermalPlasma] @@ -4784,9 +3936,6 @@ useMPI = 1 numprocs = 2 useOMP = 0 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 analysisRoutine = Examples/Tests/energy_conserving_thermal_plasma/analysis.py [focusing_gaussian_beam] @@ -4801,10 +3950,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -doComparison = 0 analysisRoutine = Examples/Tests/gaussian_beam/analysis_focusing_beam.py [particle_boundary_interaction] @@ -4821,10 +3966,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 1 -particleTypes = electrons outputFile = particle_boundary_interaction_plt analysisRoutine = Examples/Tests/particle_boundary_interaction/analysis.py @@ -4840,9 +3981,6 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 analysisRoutine = Examples/Tests/particle_thermal_boundary/analysis_2d.py [openbc_poisson_solver] @@ -4857,8 +3995,4 @@ useMPI = 1 numprocs = 2 useOMP = 1 numthreads = 1 -compileTest = 0 -doVis = 0 -compareParticles = 0 -doComparison = 0 analysisRoutine = Examples/Tests/openbc_poisson_solver/analysis.py diff --git a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H index a386cb3012e..84e0fef8c9c 100644 --- a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H +++ b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H @@ -368,14 +368,12 @@ public: // given by the `indices_1[cell_start_1:cell_stop_1]` index_type const cell_start_1 = cell_offsets_1[i_cell]; index_type const cell_stop_1 = cell_offsets_1[i_cell+1]; - index_type const cell_half_1 = (cell_start_1+cell_stop_1)/2; // Do not collide if there is only one particle in the cell if ( cell_stop_1 - cell_start_1 <= 1 ) { return; } // shuffle - ShuffleFisherYates( - indices_1, cell_start_1, cell_half_1, engine ); + ShuffleFisherYates(indices_1, cell_start_1, cell_stop_1, engine); } ); diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H index 04440288ba3..6d0b48615a4 100644 --- a/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H +++ b/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H @@ -14,6 +14,7 @@ template AMREX_GPU_HOST_DEVICE T_R ComputeTemperature ( T_index const Is, T_index const Ie, T_index const * AMREX_RESTRICT I, + T_R const * AMREX_RESTRICT w, T_R const * AMREX_RESTRICT ux, T_R const * AMREX_RESTRICT uy, T_R const * AMREX_RESTRICT uz, T_R const m ) { @@ -26,6 +27,7 @@ T_R ComputeTemperature ( T_R vx = T_R(0.0); T_R vy = T_R(0.0); T_R vz = T_R(0.0); T_R vs = T_R(0.0); T_R gm = T_R(0.0); T_R us = T_R(0.0); + T_R wtot = T_R(0.0); for (int i = Is; i < static_cast(Ie); ++i) { @@ -33,14 +35,15 @@ T_R ComputeTemperature ( uy[ I[i] ] * uy[ I[i] ] + uz[ I[i] ] * uz[ I[i] ] ); gm = std::sqrt( T_R(1.0) + us*inv_c2 ); - vx += ux[ I[i] ] / gm; - vy += uy[ I[i] ] / gm; - vz += uz[ I[i] ] / gm; - vs += us / gm / gm; + wtot += w[ I[i] ]; + vx += w[ I[i] ] * ux[ I[i] ] / gm; + vy += w[ I[i] ] * uy[ I[i] ] / gm; + vz += w[ I[i] ] * uz[ I[i] ] / gm; + vs += w[ I[i] ] * us / gm / gm; } - vx = vx / N; vy = vy / N; - vz = vz / N; vs = vs / N; + vx = vx / wtot; vy = vy / wtot; + vz = vz / wtot; vs = vs / wtot; return m/T_R(3.0)*(vs-(vx*vx+vy*vy+vz*vz)); } diff --git a/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H index af4e6ba38c9..a782fac5f6e 100644 --- a/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H +++ b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H @@ -74,12 +74,12 @@ void ElasticCollisionPerez ( T_PR T1t; T_PR T2t; if ( T1 <= T_PR(0.0) && L <= T_PR(0.0) ) { - T1t = ComputeTemperature(I1s,I1e,I1,u1x,u1y,u1z,m1); + T1t = ComputeTemperature(I1s,I1e,I1,w1,u1x,u1y,u1z,m1); } else { T1t = T1; } if ( T2 <= T_PR(0.0) && L <= T_PR(0.0) ) { - T2t = ComputeTemperature(I2s,I2e,I2,u2x,u2y,u2z,m2); + T2t = ComputeTemperature(I2s,I2e,I2,w2,u2x,u2y,u2z,m2); } else { T2t = T2; } diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp index 02f093e3c1f..33bb38e0137 100644 --- a/Source/WarpX.cpp +++ b/Source/WarpX.cpp @@ -2590,13 +2590,13 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm } } } else { - AllocInitMultiFab(Bfield_aux[lev][0], amrex::convert(ba, Bx_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[x]"); - AllocInitMultiFab(Bfield_aux[lev][1], amrex::convert(ba, By_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[y]"); - AllocInitMultiFab(Bfield_aux[lev][2], amrex::convert(ba, Bz_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[z]"); + AllocInitMultiFab(Bfield_aux[lev][0], amrex::convert(ba, Bx_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[x]", 0.0_rt); + AllocInitMultiFab(Bfield_aux[lev][1], amrex::convert(ba, By_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[y]", 0.0_rt); + AllocInitMultiFab(Bfield_aux[lev][2], amrex::convert(ba, Bz_nodal_flag), dm, ncomps, ngEB, lev, "Bfield_aux[z]", 0.0_rt); - AllocInitMultiFab(Efield_aux[lev][0], amrex::convert(ba, Ex_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[x]"); - AllocInitMultiFab(Efield_aux[lev][1], amrex::convert(ba, Ey_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[y]"); - AllocInitMultiFab(Efield_aux[lev][2], amrex::convert(ba, Ez_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[z]"); + AllocInitMultiFab(Efield_aux[lev][0], amrex::convert(ba, Ex_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[x]", 0.0_rt); + AllocInitMultiFab(Efield_aux[lev][1], amrex::convert(ba, Ey_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[y]", 0.0_rt); + AllocInitMultiFab(Efield_aux[lev][2], amrex::convert(ba, Ez_nodal_flag), dm, ncomps, ngEB, lev, "Efield_aux[z]", 0.0_rt); } // The external fields that are read from file @@ -2747,22 +2747,22 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm if (n_field_gather_buffer > 0 || mypc->nSpeciesGatherFromMainGrid() > 0) { if (aux_is_nodal) { BoxArray const& cnba = amrex::convert(cba,IntVect::TheNodeVector()); - AllocInitMultiFab(Bfield_cax[lev][0], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[x]"); - AllocInitMultiFab(Bfield_cax[lev][1], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[y]"); - AllocInitMultiFab(Bfield_cax[lev][2], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[z]"); - AllocInitMultiFab(Efield_cax[lev][0], cnba,dm,ncomps,ngEB,lev, "Efield_cax[x]"); - AllocInitMultiFab(Efield_cax[lev][1], cnba,dm,ncomps,ngEB,lev, "Efield_cax[y]"); - AllocInitMultiFab(Efield_cax[lev][2], cnba,dm,ncomps,ngEB,lev, "Efield_cax[z]"); + AllocInitMultiFab(Bfield_cax[lev][0], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[x]", 0.0_rt); + AllocInitMultiFab(Bfield_cax[lev][1], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[y]", 0.0_rt); + AllocInitMultiFab(Bfield_cax[lev][2], cnba,dm,ncomps,ngEB,lev, "Bfield_cax[z]", 0.0_rt); + AllocInitMultiFab(Efield_cax[lev][0], cnba,dm,ncomps,ngEB,lev, "Efield_cax[x]", 0.0_rt); + AllocInitMultiFab(Efield_cax[lev][1], cnba,dm,ncomps,ngEB,lev, "Efield_cax[y]", 0.0_rt); + AllocInitMultiFab(Efield_cax[lev][2], cnba,dm,ncomps,ngEB,lev, "Efield_cax[z]", 0.0_rt); } else { // Create the MultiFabs for B - AllocInitMultiFab(Bfield_cax[lev][0], amrex::convert(cba,Bx_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[x]"); - AllocInitMultiFab(Bfield_cax[lev][1], amrex::convert(cba,By_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[y]"); - AllocInitMultiFab(Bfield_cax[lev][2], amrex::convert(cba,Bz_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[z]"); + AllocInitMultiFab(Bfield_cax[lev][0], amrex::convert(cba,Bx_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[x]", 0.0_rt); + AllocInitMultiFab(Bfield_cax[lev][1], amrex::convert(cba,By_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[y]", 0.0_rt); + AllocInitMultiFab(Bfield_cax[lev][2], amrex::convert(cba,Bz_nodal_flag),dm,ncomps,ngEB,lev, "Bfield_cax[z]", 0.0_rt); // Create the MultiFabs for E - AllocInitMultiFab(Efield_cax[lev][0], amrex::convert(cba,Ex_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[x]"); - AllocInitMultiFab(Efield_cax[lev][1], amrex::convert(cba,Ey_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[y]"); - AllocInitMultiFab(Efield_cax[lev][2], amrex::convert(cba,Ez_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[z]"); + AllocInitMultiFab(Efield_cax[lev][0], amrex::convert(cba,Ex_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[x]", 0.0_rt); + AllocInitMultiFab(Efield_cax[lev][1], amrex::convert(cba,Ey_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[y]", 0.0_rt); + AllocInitMultiFab(Efield_cax[lev][2], amrex::convert(cba,Ez_nodal_flag),dm,ncomps,ngEB,lev, "Efield_cax[z]", 0.0_rt); } AllocInitMultiFab(gather_buffer_masks[lev], ba, dm, ncomps, amrex::IntVect(1), lev, "gather_buffer_masks"); diff --git a/Source/ablastr/fields/CMakeLists.txt b/Source/ablastr/fields/CMakeLists.txt index 158e623ebaf..56acc678217 100644 --- a/Source/ablastr/fields/CMakeLists.txt +++ b/Source/ablastr/fields/CMakeLists.txt @@ -1,6 +1,6 @@ foreach(D IN LISTS WarpX_DIMS) warpx_set_suffix_dims(SD ${D}) - if(WarpX_FFT AND D EQUAL 3) + if(ABLASTR_FFT AND D EQUAL 3) target_sources(ablastr_${SD} PRIVATE IntegratedGreenFunctionSolver.cpp diff --git a/Source/ablastr/fields/PoissonSolver.H b/Source/ablastr/fields/PoissonSolver.H index fed76b2987b..ca262981010 100644 --- a/Source/ablastr/fields/PoissonSolver.H +++ b/Source/ablastr/fields/PoissonSolver.H @@ -15,7 +15,7 @@ #include #include -#if defined(WARPX_USE_FFT) && defined(WARPX_DIM_3D) +#if defined(ABLASTR_USE_FFT) && defined(WARPX_DIM_3D) #include #endif @@ -160,9 +160,9 @@ computePhi (amrex::Vector const & rho, {{ beta[0], beta[1], beta[2] }}; #endif -#if !defined(WARPX_USE_FFT) +#if !defined(ABLASTR_USE_FFT) ABLASTR_ALWAYS_ASSERT_WITH_MESSAGE( !is_solver_igf_on_lev0, - "Must compile with -DWarpX_FFT=ON to use the FFT solver!"); + "Must compile with FFT support to use the IGF solver!"); #endif #if !defined(WARPX_DIM_3D) @@ -170,7 +170,7 @@ computePhi (amrex::Vector const & rho, "The FFT Poisson solver is currently only implemented for 3D!"); #endif -#if (defined(WARPX_USE_FFT) && defined(WARPX_DIM_3D)) +#if (defined(ABLASTR_USE_FFT) && defined(WARPX_DIM_3D)) // Use the Integrated Green Function solver (FFT) on the coarsest level if it was selected if(is_solver_igf_on_lev0 && lev==0){ amrex::Array const dx_igf diff --git a/Source/ablastr/math/fft/CMakeLists.txt b/Source/ablastr/math/fft/CMakeLists.txt index 2b9fc3d37f9..913a912e1ee 100644 --- a/Source/ablastr/math/fft/CMakeLists.txt +++ b/Source/ablastr/math/fft/CMakeLists.txt @@ -1,6 +1,6 @@ foreach(D IN LISTS WarpX_DIMS) warpx_set_suffix_dims(SD ${D}) - if(WarpX_FFT STREQUAL ON) + if(ABLASTR_FFT STREQUAL ON) if(WarpX_COMPUTE STREQUAL CUDA) target_sources(ablastr_${SD} PRIVATE WrapCuFFT.cpp) elseif(WarpX_COMPUTE STREQUAL HIP) diff --git a/Tools/machines/karolina-it4i/install_dependencies.sh b/Tools/machines/karolina-it4i/install_dependencies.sh index 0435b5e2926..cba455f3d29 100755 --- a/Tools/machines/karolina-it4i/install_dependencies.sh +++ b/Tools/machines/karolina-it4i/install_dependencies.sh @@ -53,7 +53,7 @@ python -m pip install --user --upgrade matplotlib #python -m pip install --user --upgrade yt # install or update WarpX dependencies -python -m pip install --user --upgrade picmistandard==0.28.0 +python -m pip install --user --upgrade picmistandard==0.29.0 python -m pip install --user --upgrade lasy # optional: for optimas (based on libEnsemble & ax->botorch->gpytorch->pytorch) diff --git a/Tools/machines/lassen-llnl/install_v100_dependencies.sh b/Tools/machines/lassen-llnl/install_v100_dependencies.sh index 6368010ab7b..48668efcc2a 100755 --- a/Tools/machines/lassen-llnl/install_v100_dependencies.sh +++ b/Tools/machines/lassen-llnl/install_v100_dependencies.sh @@ -119,7 +119,7 @@ python3 -m pip install --upgrade build python3 -m pip install --upgrade packaging python3 -m pip install --upgrade wheel python3 -m pip install --upgrade setuptools -# Older version for h4py +# Older version for h5py # https://github.com/h5py/h5py/issues/2268 python3 -m pip install --upgrade "cython<3" python3 -m pip install --upgrade numpy diff --git a/Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh b/Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh index 916986ee119..a6d5aad32fb 100644 --- a/Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh +++ b/Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh @@ -82,13 +82,12 @@ if [ -d ${SRC_DIR}/blaspp ] then cd ${SRC_DIR}/blaspp git fetch --prune - git checkout master - git pull + git checkout v2024.05.31 cd - else - git clone https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp + git clone -b v2024.05.31 https://github.com/icl-utk-edu/blaspp.git ${SRC_DIR}/blaspp fi -cmake -S ${SRC_DIR}/blaspp -B ${build_dir}/blaspp-lassen-build -Duse_openmp=ON -Dgpu_backend=cuda -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-master +cmake -S ${SRC_DIR}/blaspp -B ${build_dir}/blaspp-lassen-build -Duse_openmp=ON -Dgpu_backend=cuda -Duse_cmake_find_blas=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=${SW_DIR}/blaspp-2024.05.31 cmake --build ${build_dir}/blaspp-lassen-build --target install --parallel 10 # LAPACK++ (for PSATD+RZ) @@ -96,13 +95,12 @@ if [ -d ${SRC_DIR}/lapackpp ] then cd ${SRC_DIR}/lapackpp git fetch --prune - git checkout master - git pull + git checkout v2024.05.31 cd - else - git clone https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp + git clone -b v2024.05.31 https://github.com/icl-utk-edu/lapackpp.git ${SRC_DIR}/lapackpp fi -CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${SRC_DIR}/lapackpp -B ${build_dir}/lapackpp-lassen-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-master -DLAPACK_LIBRARIES=/usr/lib64/liblapack.so +CXXFLAGS="-DLAPACK_FORTRAN_ADD_" cmake -S ${SRC_DIR}/lapackpp -B ${build_dir}/lapackpp-lassen-build -Duse_cmake_find_lapack=ON -DCMAKE_CXX_STANDARD=17 -Dbuild_tests=OFF -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DCMAKE_INSTALL_PREFIX=${SW_DIR}/lapackpp-2024.05.31 -DLAPACK_LIBRARIES=/usr/lib64/liblapack.so cmake --build ${build_dir}/lapackpp-lassen-build --target install --parallel 10 @@ -121,7 +119,7 @@ python3 -m pip install --upgrade build python3 -m pip install --upgrade packaging python3 -m pip install --upgrade wheel python3 -m pip install --upgrade setuptools -# Older version for h4py +# Older version for h5py # https://github.com/h5py/h5py/issues/2268 python3 -m pip install --upgrade "cython<3" python3 -m pip install --upgrade numpy diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 0b90b09df30..8acbd974779 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -273,7 +273,7 @@ set(WarpX_amrex_src "" set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)") -set(WarpX_amrex_branch "24.07" +set(WarpX_amrex_branch "dcb9cc0383dcc71e38dee9070574e325a812f8bf" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index 5c17681d4b6..a2fbd0ddee8 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -79,7 +79,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON) set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git" CACHE STRING "Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)") -set(WarpX_pyamrex_branch "24.07" +set(WarpX_pyamrex_branch "18f0026b1dd9b2aa4869c96f74e4b77262a067d0" CACHE STRING "Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)") diff --git a/run_test.sh b/run_test.sh index 37264bef243..c01c3fb1176 100755 --- a/run_test.sh +++ b/run_test.sh @@ -68,7 +68,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt # Clone AMReX and warpx-data git clone https://github.com/AMReX-Codes/amrex.git -cd amrex && git checkout --detach 24.07 && cd - +cd amrex && git checkout --detach dcb9cc0383dcc71e38dee9070574e325a812f8bf && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git # openPMD-example-datasets contains various required data sets @@ -80,8 +80,6 @@ cd - # Clone the AMReX regression test utility git clone https://github.com/AMReX-Codes/regression_testing.git -# FIXME: https://github.com/AMReX-Codes/regression_testing/issues/136 -cd regression_testing && git checkout 93ddfb11456f47d6555c39388ba1a4ead61fbf4e && cd - # Prepare regression tests mkdir -p rt-WarpX/WarpX-benchmarks @@ -96,10 +94,10 @@ cd ../../regression_testing/ echo "cd $PWD" # run only tests specified in variable tests_arg (single test or multiple tests) if [[ ! -z "${tests_arg}" ]]; then - python3 regtest.py ../rt-WarpX/ci-tests.ini --no_update all "${tests_run}" + python3 regtest.py ../rt-WarpX/ci-tests.ini --skip_comparison --no_update all "${tests_run}" # run all tests (variables tests_arg and tests_run are empty) else - python3 regtest.py ../rt-WarpX/ci-tests.ini --no_update all + python3 regtest.py ../rt-WarpX/ci-tests.ini --skip_comparison --no_update all fi # clean up python virtual environment