Skip to content

Commit

Permalink
Merge pull request #731 from SmileiPIC/develop
Browse files Browse the repository at this point in the history
merge develop in master
  • Loading branch information
mccoys authored Jun 24, 2024
2 parents 4564449 + b90b3b5 commit 21a2845
Show file tree
Hide file tree
Showing 170 changed files with 4,340 additions and 2,980 deletions.
56 changes: 28 additions & 28 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ stages:
- compile_debug
- compile_no_mpi_threadmultiple
- compile_no_openmp
- compile_omptasks
- run_omptasks
# - compile_omptasks
# - run_omptasks

install:
stage: install
only:
- develop

script:
# Force workdir cleaning in case of retried
- echo "CI_PIPELINE_ID = " $CI_PIPELINE_ID
Expand All @@ -33,7 +33,7 @@ compile_default:
stage: compile_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -44,7 +44,7 @@ runQuick:
stage: run_quick
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -55,7 +55,7 @@ run1D:
stage: run_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -67,7 +67,7 @@ run2D:
stage: run_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -81,7 +81,7 @@ run3D:
stage: run_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -96,7 +96,7 @@ runAM:
stage: run_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand All @@ -108,7 +108,7 @@ runCollisions:
stage: run_default
only:
- develop

script:
# Move in test dir
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
Expand Down Expand Up @@ -164,21 +164,21 @@ compile_no_openmp:
- make clean
- python validation/validation.py -k noopenmp -c -v

compile_omptasks:
stage: compile_omptasks
only:
- develop

script:
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei
- make clean
- python validation/validation.py -k omptasks -c -v

run_omptasks:
stage: run_omptasks
only:
- develop

script:
- cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
- python validation.py -k omptasks -b "tst2d_tasks_01_radiation_pressure_acc.py" -m 4 -o 4 -n 1 -v
#compile_omptasks:
# stage: compile_omptasks
# only:
# - develop
#
# script:
# - cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei
# - make clean
# - python validation/validation.py -k omptasks -c -v
#
#run_omptasks:
# stage: run_omptasks
# only:
# - develop
#
# script:
# - cd /sps3/gitlab-runner/$CI_PIPELINE_ID/smilei/validation
# - python validation.py -k omptasks -b "tst2d_tasks_01_radiation_pressure_acc.py" -m 4 -o 4 -n 1 -v
2 changes: 1 addition & 1 deletion benchmarks/gpu/tst3d_gpu_o2_thermal_plasma_medium.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def InitialChargeDensity(x, y, z):
number_of_patches = kPatchPerGridDimension,
EM_boundary_conditions = [ ["periodic"] ],
print_every = 10,
random_seed = smilei_mpi_rank)
)

Vectorization(mode = "off")

Expand Down
1 change: 0 additions & 1 deletion benchmarks/gpu/tst3d_gpu_o2_thermal_plasma_short.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
gpu_computing = True,

# random_seed = 0xDEADBEEF,
random_seed = smilei_mpi_rank,
)

Vectorization(
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/gpu/tst3d_v_o2_thermal_plasma_medium.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def InitialChargeDensity(x, y, z):
number_of_patches = kPatchPerGridDimension,
EM_boundary_conditions = [ ["periodic"] ],
print_every = 10,
random_seed = smilei_mpi_rank)
)

Vectorization(mode = "on")

Expand Down
1 change: 0 additions & 1 deletion benchmarks/gpu/tst3d_v_o2_thermal_plasma_short.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
gpu_computing = False,

# random_seed = 0xDEADBEEF,
random_seed = smilei_mpi_rank,
)

Vectorization(
Expand Down
95 changes: 0 additions & 95 deletions benchmarks/tst1d_24_cir_plane_wave_BTIS3.py

This file was deleted.

1 change: 0 additions & 1 deletion benchmarks/tst2d_18_em_pml.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
['PML','PML'],
],
number_of_pml_cells = [[10,10],[10,10]],
random_seed = smilei_mpi_rank
)

Antenna(
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_s_o4_laser_wake_vay.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

solve_poisson = False,
print_every = 100,

random_seed = smilei_mpi_rank
)

MovingWindow(
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_s_o4_radiation_pressure_acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
['silver-muller'],
['periodic'],
],

random_seed = smilei_mpi_rank
)

Vectorization(
Expand Down
1 change: 0 additions & 1 deletion benchmarks/tst2d_tasks_01_radiation_pressure_acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
['periodic'],
],
cluster_width = 16,
random_seed = smilei_mpi_rank
)


Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_v_o2_em_propagation.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
],

EM_boundary_conditions_k = [[cos(ang), sin(ang)],[-1.,0.],[0.,1.],[0.,-1.]],

random_seed = smilei_mpi_rank
)

Vectorization(
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_v_o4_em_propagation.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
],

EM_boundary_conditions_k = [[cos(ang), sin(ang)],[-1.,0.],[0.,1.],[0.,-1.]],

random_seed = smilei_mpi_rank
)

Vectorization(
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_v_o4_laser_wake_vay.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

solve_poisson = False,
print_every = 100,

random_seed = smilei_mpi_rank
)

Vectorization(
Expand Down
3 changes: 0 additions & 3 deletions benchmarks/tst2d_v_o4_multiphoton_Breit_Wheeler.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ def n0_positron(x,y):
simulation_time = Tsim,

EM_boundary_conditions = [field_cond, field_cond],

random_seed = smilei_mpi_rank,

reference_angular_frequency_SI = wr
)

Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst2d_v_o4_radiation_pressure_acc.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
['silver-muller'],
['periodic'],
],

random_seed = smilei_mpi_rank
)


Expand Down
2 changes: 0 additions & 2 deletions benchmarks/tst3d_s_o4_em_propagation.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
simulation_time = Tsim,

EM_boundary_conditions = [ ['silver-muller'] ],

random_seed = smilei_mpi_rank
)

LaserGaussian3D(
Expand Down
Loading

0 comments on commit 21a2845

Please sign in to comment.