Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce particle shape when a particle approaches the EB #5209

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
9ee80aa
Removal of asserttion which prevented from usung the averaged PSATD a…
oshapoval Apr 12, 2024
301d7f9
Merge remote-tracking branch 'origin/development' into development
oshapoval May 8, 2024
dcc64ff
Merge remote-tracking branch 'origin/development' into development
oshapoval May 10, 2024
debd672
Merge branch 'development' of https://github.com/ECP-WarpX/WarpX into…
oshapoval May 14, 2024
bd3e2ba
Merge branch 'development' of https://github.com/ECP-WarpX/WarpX into…
oshapoval May 14, 2024
fbdff0e
Merge remote-tracking branch 'origin/development' into development
oshapoval May 15, 2024
cad2c66
Merge remote-tracking branch 'origin/development' into development
oshapoval Jun 4, 2024
e1e929f
Merge remote-tracking branch 'origin/development' into development
oshapoval Jun 5, 2024
f10f8fd
Merge remote-tracking branch 'origin/development' into development
oshapoval Jun 10, 2024
5a7f5ad
Merge remote-tracking branch 'origin/development' into development
oshapoval Jun 17, 2024
8374ac7
Merge remote-tracking branch 'origin/development' into development
oshapoval Jun 18, 2024
746c9f5
Merge branch 'development' of https://github.com/ECP-WarpX/WarpX into…
oshapoval Jul 14, 2024
05b708d
Merge branch 'development' of https://github.com/ECP-WarpX/WarpX into…
oshapoval Jul 26, 2024
a0c660c
Merge branch 'development' of https://github.com/ECP-WarpX/WarpX into…
oshapoval Jul 29, 2024
8d5cbc8
Merge remote-tracking branch 'origin/development' into development
oshapoval Aug 2, 2024
3574fa3
Added ParticleBoundaryScrapingDiagnostic class.
oshapoval Aug 6, 2024
0de03c7
Temp commit: testing an unreleased PICMI version.
oshapoval Aug 6, 2024
dbd0047
Temp commit: updated PICMI version.
oshapoval Aug 6, 2024
4067aec
Temp commit: updated PICMI version in setup.py
oshapoval Aug 6, 2024
66d324e
Activated scraping boundary diagnostics in the CI test: spacecraft_ch…
oshapoval Aug 6, 2024
a8e5bd1
Merge branch 'development' into add_scraping_diags_picmi
RemiLehe Aug 7, 2024
4ed94cb
Merge branch 'development' into add_scraping_diags_picmi
RemiLehe Aug 15, 2024
03c8e7f
Compute whether particles are inside EB
RemiLehe Aug 19, 2024
a148624
Implement change of shape factor
RemiLehe Aug 19, 2024
c02d689
Add automated test
RemiLehe Aug 20, 2024
0051a17
Simplify code for computing distance to EB
RemiLehe Aug 20, 2024
765f396
Remove unused parameter
RemiLehe Aug 20, 2024
08d19e2
Use new shapes
RemiLehe Aug 20, 2024
0dc0c64
Revert "Simplify code for computing distance to EB"
RemiLehe Aug 20, 2024
25c1b26
Fix computation of EB distance
RemiLehe Aug 20, 2024
bd5aba3
Merge branch 'development' into reduce_particle_shape
RemiLehe Aug 20, 2024
330707a
Use latest picmistandard version
RemiLehe Aug 22, 2024
96ce024
Merge branch 'development' into add_scraping_diags_picmi
RemiLehe Aug 22, 2024
85728ba
Revert "Removal of asserttion which prevented from usung the averaged…
RemiLehe Aug 22, 2024
de29a55
Update Examples/Physics_applications/spacecraft_charging/PICMI_inputs…
RemiLehe Aug 22, 2024
c2e1620
Merge branch 'add_scraping_diags_picmi' into reduce_particle_shape
RemiLehe Aug 22, 2024
a19340d
Merge branch 'development' into reduce_particle_shape
RemiLehe Aug 23, 2024
6de6ae0
Merge branch 'development' into reduce_particle_shape
RemiLehe Aug 28, 2024
552c8d2
Added a new CI test: embedded_boundary_removal_depth.
oshapoval Sep 3, 2024
a2db7f0
Added an analysis.py script.
oshapoval Sep 3, 2024
d7b8333
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 3, 2024
68a1d6a
Merge remote-tracking branch 'origin/development' into HEAD
oshapoval Sep 16, 2024
dd684a6
Updated embedded_boundary_removal_depth CI test & analysis
oshapoval Sep 17, 2024
e27d29e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 17, 2024
5615c12
Clean-up
oshapoval Sep 17, 2024
92c76a6
Merge branch 'add_analysis_embedded_boundary_removal_depth' of https:…
oshapoval Sep 17, 2024
0ceda51
Added missing CMakeLists.txt for embedded_boundary_removal_depth CI
oshapoval Sep 17, 2024
f8b2fc4
Changed dimensions of arrays eb_dxi and eb_plo from 3D to AMREX_SPACEDIM
oshapoval Oct 1, 2024
736d7cf
Clean-up: removed rebudant assignment of the colorbar object to cbar
oshapoval Oct 1, 2024
ae888f1
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Oct 15, 2024
b8fb505
Merge remote-tracking branch 'origin/development' into add_analysis_e…
oshapoval Oct 29, 2024
b64dcf0
Added two more 3D embedded_boundary_removal_depth CIs with shape fact…
oshapoval Oct 29, 2024
a2223c5
Added and updated embedded_boundary_removal_depth CIs with shape fact…
oshapoval Oct 30, 2024
fc54dd1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 30, 2024
7c07b07
Clean-up
oshapoval Oct 31, 2024
3c706d0
Clean-up
oshapoval Oct 31, 2024
1fbad08
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 31, 2024
d058440
Moved distance_to_eb_arr and the correspondinf part of the code insid…
oshapoval Nov 5, 2024
66b029e
Added missing curly brace
oshapoval Nov 5, 2024
901bc6d
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Nov 7, 2024
fe118a7
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Nov 18, 2024
737df48
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Dec 13, 2024
2d6d6bd
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Dec 16, 2024
1dbaeb3
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Jan 2, 2025
3fa996f
Modify stair-case approximation
RemiLehe Jan 3, 2025
112cce1
Fix compilation without EB
RemiLehe Jan 5, 2025
b0ccce4
Slightly modify boundaries
RemiLehe Jan 6, 2025
76fa82e
Added new arrays with flags
RemiLehe Jan 8, 2025
3624a72
Finalize initialization of the array
RemiLehe Jan 8, 2025
3181d45
Use guard cell information
RemiLehe Jan 8, 2025
38d967d
Remove edge_length in field update
RemiLehe Jan 9, 2025
79ed114
Fix const-ness
RemiLehe Jan 9, 2025
8516d1a
Fix compilation warning
RemiLehe Jan 9, 2025
3c0867e
Updated init functions
RemiLehe Jan 10, 2025
28d43a1
Fix initialization criterion
RemiLehe Jan 10, 2025
0214769
Add flag for B
RemiLehe Jan 10, 2025
ab87809
Fix RZ compilation error
RemiLehe Jan 10, 2025
78bb8c1
Update initialization of external fields
RemiLehe Jan 11, 2025
df9ae82
Fix setting of eb_update
RemiLehe Jan 11, 2025
59579b4
Implement ECT condition for B
RemiLehe Jan 11, 2025
4fd4dc7
Do not use any guard cells
RemiLehe Jan 11, 2025
4232db7
Fixed ECT solver
RemiLehe Jan 11, 2025
4b8079f
Merge branch 'move_stair_case_approx' of github.com:RemiLehe/WarpX in…
RemiLehe Jan 11, 2025
f45b257
Revert "Do not use any guard cells"
RemiLehe Jan 12, 2025
2003d85
Fix compilation errors
RemiLehe Jan 12, 2025
d6e64af
Fix compilation error
RemiLehe Jan 12, 2025
e6d93f9
Fix const-ness
RemiLehe Jan 12, 2025
eb43087
Activate load-balancing
RemiLehe Jan 12, 2025
2eb3383
Update checksums
RemiLehe Jan 12, 2025
8981179
Add documentation
RemiLehe Jan 12, 2025
8182df7
Apply suggestions from code review
RemiLehe Jan 14, 2025
fb20d08
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 16, 2025
49da534
Merge branch 'move_stair_case_approx' into add_analysis_embedded_boun…
RemiLehe Jan 16, 2025
f2a84a6
Add new tests for particle absorption on EB with EM solver
RemiLehe Jan 15, 2025
4c85916
Remove previous tests
RemiLehe Jan 17, 2025
46980a5
Update checksums
RemiLehe Jan 16, 2025
5c36e23
Update tolerance
RemiLehe Jan 16, 2025
74d78da
Merge branch 'add_analysis_embedded_boundary_removal_depth' of github…
RemiLehe Jan 17, 2025
e2493a4
Remove test
RemiLehe Jan 17, 2025
6cefa69
Add tests for higher-order shape factors
RemiLehe Jan 17, 2025
0980516
Minor cleanup
RemiLehe Jan 17, 2025
ace399b
Modify initialization in ECT solver
RemiLehe Jan 18, 2025
16ec9b2
Update comments
RemiLehe Jan 18, 2025
45c4d30
Allocate new flag
RemiLehe Jan 21, 2025
a939b3c
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Jan 21, 2025
14761ec
Merge branch 'move_stair_case_approx' into add_analysis_embedded_boun…
RemiLehe Jan 21, 2025
7587b4d
Initialize new data structures
RemiLehe Jan 21, 2025
de366d8
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Jan 22, 2025
16552ef
Revert "WarpX header: remove unused GetDistanceToEB function (#5589)"
RemiLehe Jan 22, 2025
2de126d
Do not use distance to EB anymore
RemiLehe Jan 22, 2025
41bdbf9
Code cleanup
RemiLehe Jan 22, 2025
b503953
Merge branch 'development' into add_analysis_embedded_boundary_remova…
RemiLehe Jan 22, 2025
5ae42ed
Simplify code
RemiLehe Jan 22, 2025
a126db2
Simplify code further
RemiLehe Jan 22, 2025
ebd0a9b
Update Source/Particles/Deposition/CurrentDeposition.H
RemiLehe Jan 23, 2025
3f8a954
Add 1D implementation
RemiLehe Jan 23, 2025
a444821
Update guard cell allocation
RemiLehe Jan 23, 2025
9cf2232
Update initialization
RemiLehe Jan 23, 2025
3291a7f
Only call new kernel when compiling with EB
RemiLehe Jan 23, 2025
1529558
Fix errors when EB are not present
RemiLehe Jan 23, 2025
b79d9d8
Do not call more expensive kernel for shape > 1
RemiLehe Jan 23, 2025
2592afe
Update const-ness
RemiLehe Jan 23, 2025
7c21665
Add checksum files
RemiLehe Jan 23, 2025
a0e7c25
Update syntax for shape factors
RemiLehe Jan 23, 2025
4093d07
Update deposition kernel
RemiLehe Jan 23, 2025
c36b72c
Use original shape factor functions
RemiLehe Jan 23, 2025
2903e4a
Do not compile modified shape factor if unused
RemiLehe Jan 23, 2025
f71e738
Apply suggestions from code review
RemiLehe Jan 23, 2025
378efb9
Fix GPU compilation
RemiLehe Jan 24, 2025
9aa5272
Correct error in analysis script
RemiLehe Jan 24, 2025
e148ca4
Merge branch 'add_analysis_embedded_boundary_removal_depth' of github…
RemiLehe Jan 24, 2025
e420533
Update checksum
RemiLehe Jan 24, 2025
fd180f5
Clarify code
RemiLehe Jan 24, 2025
5b9beb5
Add more documentation
RemiLehe Jan 24, 2025
d2de3a0
Code refactoring
RemiLehe Jan 24, 2025
8665c30
Update documentation
RemiLehe Jan 24, 2025
39214e3
Minor refactor
RemiLehe Jan 27, 2025
9365e46
Correct const error
RemiLehe Jan 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,29 @@ if(WarpX_EB)
)
endif()

if(WarpX_EB)
add_warpx_test(
test_3d_embedded_boundary_em_particle_absorption_sh_factor_2 # name
3 # dims
1 # nprocs
inputs_test_3d_embedded_boundary_em_particle_absorption_sh_factor_2 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
test_3d_embedded_boundary_em_particle_absorption_sh_factor_3 # name
3 # dims
1 # nprocs
inputs_test_3d_embedded_boundary_em_particle_absorption_sh_factor_3 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
Expand All @@ -26,6 +49,30 @@ if(WarpX_EB)
)
endif()

if(WarpX_EB)
add_warpx_test(
test_2d_embedded_boundary_em_particle_absorption_sh_factor_2 # name
2 # dims
1 # nprocs
inputs_test_2d_embedded_boundary_em_particle_absorption_sh_factor_2 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
test_2d_embedded_boundary_em_particle_absorption_sh_factor_3 # name
2 # dims
1 # nprocs
inputs_test_2d_embedded_boundary_em_particle_absorption_sh_factor_3 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
test_rz_embedded_boundary_em_particle_absorption_sh_factor_1 # name
Expand All @@ -37,3 +84,27 @@ if(WarpX_EB)
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
test_rz_embedded_boundary_em_particle_absorption_sh_factor_2 # name
RZ # dims
1 # nprocs
inputs_test_rz_embedded_boundary_em_particle_absorption_sh_factor_2 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()

if(WarpX_EB)
add_warpx_test(
test_rz_embedded_boundary_em_particle_absorption_sh_factor_3 # name
RZ # dims
1 # nprocs
inputs_test_rz_embedded_boundary_em_particle_absorption_sh_factor_3 # inputs
"analysis.py" # analysis
"analysis_default_regression.py --path diags/diag1" # checksum
OFF # dependency
)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
elif dim == "thetaMode":
# In RZ: there are issues with divE on axis
# Set the few cells around the axis to 0 for this test
divE_avg[13:19] = 0
divE_avg[:, 13:19] = 0
tolerance = 4e-12


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = 2
amr.n_cell = 32 32
geometry.prob_lo = -10 -10
geometry.prob_hi = 10 10
boundary.field_lo = pec absorbing_silver_mueller
boundary.field_hi = pec absorbing_silver_mueller

algo.particle_shape = 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = 2
amr.n_cell = 32 32
geometry.prob_lo = -10 -10
geometry.prob_hi = 10 10
boundary.field_lo = pec absorbing_silver_mueller
boundary.field_hi = pec absorbing_silver_mueller

algo.particle_shape = 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = 3
amr.n_cell = 32 32 32
geometry.prob_lo = -10 -10 -10
geometry.prob_hi = 10 10 10
boundary.field_lo = pec pec absorbing_silver_mueller
boundary.field_hi = pec pec absorbing_silver_mueller

algo.particle_shape = 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = 3
amr.n_cell = 32 32 32
geometry.prob_lo = -10 -10 -10
geometry.prob_hi = 10 10 10
boundary.field_lo = pec pec absorbing_silver_mueller
boundary.field_hi = pec pec absorbing_silver_mueller

algo.particle_shape = 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = RZ
amr.n_cell = 16 32
geometry.prob_lo = 0 -10
geometry.prob_hi = 10 10
boundary.field_lo = none absorbing_silver_mueller
boundary.field_hi = pec absorbing_silver_mueller

algo.particle_shape = 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# base input parameters
FILE = inputs_base

geometry.dims = RZ
amr.n_cell = 16 32
geometry.prob_lo = 0 -10
geometry.prob_hi = 10 10
boundary.field_lo = none absorbing_silver_mueller
boundary.field_hi = pec absorbing_silver_mueller

algo.particle_shape = 3
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"lev=0": {
"divE": 2.4521053721245334e-08,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"lev=0": {
"divE": 2.2059346534892452e-08,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"lev=0": {
"Bx": 0.0,
"By": 2.3792992316172512e-15,
"Bz": 0.0 ,
"Ex": 6.177046470842443e-07,
"Ey": 0.0,
"Ez": 7.259396011803518e-07,
"divE": 2.809306467366024e-07,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"lev=0": {
"Bx": 0.0,
"By": 2.3948084603369097e-15,
"Bz": 0.0,
"Ex": 6.747158562891953e-07,
"Ey": 0.0,
"Ez": 5.541309886315263e-07,
"divE": 2.091715826275267e-07,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"lev=0": {
"Bx": 0.0,
"By": 2.379299231617251e-15,
"Bz": 0.0,
"Ex": 6.177046470842443e-07,
"Ey": 0.0,
"Ez": 7.259396011803522e-07,
"divE": 2.8093064673660275e-07,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"lev=0": {
"divE": 4.928354322096152e-07,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"lev=0": {
"divE": 4.3355127342920327e-07,
"rho": 0.0
},
"electron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
},
"positron": {
"particle_position_x": 0.0,
"particle_position_y": 0.0,
"particle_position_z": 0.0,
"particle_momentum_x": 0.0,
"particle_momentum_y": 0.0,
"particle_momentum_z": 0.0,
"particle_weight": 0.0
}
}
Loading
Loading