diff --git a/epoch1d/src/physics_packages/collisions.F90 b/epoch1d/src/physics_packages/collisions.F90 index ddba8c20a..fe2ee6dcf 100644 --- a/epoch1d/src/physics_packages/collisions.F90 +++ b/epoch1d/src/physics_packages/collisions.F90 @@ -2189,8 +2189,8 @@ SUBROUTINE test_shuffle part => partlist%head DO j = 1, plist_length histo(j) = histo(j) + part%coll_count - if (minp(j) > part%coll_count) minp(j) = part%coll_count - if (maxp(j) < part%coll_count) maxp(j) = part%coll_count + IF (minp(j) > part%coll_count) minp(j) = part%coll_count + IF (maxp(j) < part%coll_count) maxp(j) = part%coll_count std_dev(j) = std_dev(j) + part%coll_count**2 part => part%next END DO diff --git a/epoch1d/src/physics_packages/ionise.F90 b/epoch1d/src/physics_packages/ionise.F90 index 13cb59c22..aa55fe5e1 100644 --- a/epoch1d/src/physics_packages/ionise.F90 +++ b/epoch1d/src/physics_packages/ionise.F90 @@ -520,7 +520,7 @@ SUBROUTINE multiphoton_tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -561,7 +561,7 @@ SUBROUTINE multiphoton_tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -768,7 +768,7 @@ SUBROUTINE multiphoton_tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -809,7 +809,7 @@ SUBROUTINE multiphoton_tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1019,7 +1019,7 @@ SUBROUTINE tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1051,7 +1051,7 @@ SUBROUTINE tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1242,7 +1242,7 @@ SUBROUTINE tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1274,7 +1274,7 @@ SUBROUTINE tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI diff --git a/epoch1d/src/physics_packages/numerics.f90 b/epoch1d/src/physics_packages/numerics.f90 index 568d50825..cab3cc786 100644 --- a/epoch1d/src/physics_packages/numerics.f90 +++ b/epoch1d/src/physics_packages/numerics.f90 @@ -687,7 +687,7 @@ REAL(num) FUNCTION rkbesl(x, alpha, nb, ize, ncalc) d1 = c * d1 + p(i) t1 = c * t1 + q(i) END DO - p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - log(ex))) / ex + p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - LOG(ex))) / ex f2 = (c + 0.5_num - ratio) * f1 / ex bk1 = p0 + (d3 * f0 - f2 + f0 + blpha) / (f2 + f1 + f0) * p0 IF (ize == 1) bk1 = bk1 * EXP(-ex) diff --git a/epoch2d/src/physics_packages/collisions.F90 b/epoch2d/src/physics_packages/collisions.F90 index ca99ed7b8..5160d4f6b 100644 --- a/epoch2d/src/physics_packages/collisions.F90 +++ b/epoch2d/src/physics_packages/collisions.F90 @@ -2228,8 +2228,8 @@ SUBROUTINE test_shuffle part => partlist%head DO j = 1, plist_length histo(j) = histo(j) + part%coll_count - if (minp(j) > part%coll_count) minp(j) = part%coll_count - if (maxp(j) < part%coll_count) maxp(j) = part%coll_count + IF (minp(j) > part%coll_count) minp(j) = part%coll_count + IF (maxp(j) < part%coll_count) maxp(j) = part%coll_count std_dev(j) = std_dev(j) + part%coll_count**2 part => part%next END DO diff --git a/epoch2d/src/physics_packages/ionise.F90 b/epoch2d/src/physics_packages/ionise.F90 index adb5f65e3..fae57c3d5 100644 --- a/epoch2d/src/physics_packages/ionise.F90 +++ b/epoch2d/src/physics_packages/ionise.F90 @@ -570,7 +570,7 @@ SUBROUTINE multiphoton_tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -611,7 +611,7 @@ SUBROUTINE multiphoton_tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -839,7 +839,7 @@ SUBROUTINE multiphoton_tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -880,7 +880,7 @@ SUBROUTINE multiphoton_tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1111,7 +1111,7 @@ SUBROUTINE tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1143,7 +1143,7 @@ SUBROUTINE tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1355,7 +1355,7 @@ SUBROUTINE tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1387,7 +1387,7 @@ SUBROUTINE tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI diff --git a/epoch2d/src/physics_packages/numerics.f90 b/epoch2d/src/physics_packages/numerics.f90 index 568d50825..cab3cc786 100644 --- a/epoch2d/src/physics_packages/numerics.f90 +++ b/epoch2d/src/physics_packages/numerics.f90 @@ -687,7 +687,7 @@ REAL(num) FUNCTION rkbesl(x, alpha, nb, ize, ncalc) d1 = c * d1 + p(i) t1 = c * t1 + q(i) END DO - p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - log(ex))) / ex + p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - LOG(ex))) / ex f2 = (c + 0.5_num - ratio) * f1 / ex bk1 = p0 + (d3 * f0 - f2 + f0 + blpha) / (f2 + f1 + f0) * p0 IF (ize == 1) bk1 = bk1 * EXP(-ex) diff --git a/epoch3d/src/physics_packages/collisions.F90 b/epoch3d/src/physics_packages/collisions.F90 index d4b766c5c..4b51e9d8c 100644 --- a/epoch3d/src/physics_packages/collisions.F90 +++ b/epoch3d/src/physics_packages/collisions.F90 @@ -2264,8 +2264,8 @@ SUBROUTINE test_shuffle part => partlist%head DO j = 1, plist_length histo(j) = histo(j) + part%coll_count - if (minp(j) > part%coll_count) minp(j) = part%coll_count - if (maxp(j) < part%coll_count) maxp(j) = part%coll_count + IF (minp(j) > part%coll_count) minp(j) = part%coll_count + IF (maxp(j) < part%coll_count) maxp(j) = part%coll_count std_dev(j) = std_dev(j) + part%coll_count**2 part => part%next END DO diff --git a/epoch3d/src/physics_packages/ionise.F90 b/epoch3d/src/physics_packages/ionise.F90 index fe6c85b84..aa325b010 100644 --- a/epoch3d/src/physics_packages/ionise.F90 +++ b/epoch3d/src/physics_packages/ionise.F90 @@ -620,7 +620,7 @@ SUBROUTINE multiphoton_tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -661,7 +661,7 @@ SUBROUTINE multiphoton_tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -910,7 +910,7 @@ SUBROUTINE multiphoton_tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -951,7 +951,7 @@ SUBROUTINE multiphoton_tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1203,7 +1203,7 @@ SUBROUTINE tunnelling_bsi sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1235,7 +1235,7 @@ SUBROUTINE tunnelling_bsi ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI @@ -1468,7 +1468,7 @@ SUBROUTINE tunnelling sample = random() ! Calculate probability of ionisation using a cumulative distribution ! function modelling ionisation in a field as an exponential decay - IF (sample < 1.0_num - exp(-1.0_num * rate * time_left)) THEN + IF (sample < 1.0_num - EXP(-1.0_num * rate * time_left)) THEN IF (species_list(current_state)%release_species > 0) THEN CALL create_particle(new) ! Create electron for release @@ -1500,7 +1500,7 @@ SUBROUTINE tunnelling ! Calculates the time of ionisation using inverse sampling, and ! subtracts it from the time step. Ensures diminishing time for ! successive ionisations - time_left = time_left + log(1.0_num - sample) / rate + time_left = time_left + LOG(1.0_num - sample) / rate ! Current correction as proposed from Mulser et al 1998, true from ! ejection energy << m_e*c**2, i.e. sub-relativistic ejection ! velocity. This shall be true for all laser gamma factors, as BSI diff --git a/epoch3d/src/physics_packages/numerics.f90 b/epoch3d/src/physics_packages/numerics.f90 index 568d50825..cab3cc786 100644 --- a/epoch3d/src/physics_packages/numerics.f90 +++ b/epoch3d/src/physics_packages/numerics.f90 @@ -687,7 +687,7 @@ REAL(num) FUNCTION rkbesl(x, alpha, nb, ize, ncalc) d1 = c * d1 + p(i) t1 = c * t1 + q(i) END DO - p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - log(ex))) / ex + p0 = EXP(c * (a + c * (p(8) - c * d1 / t1) - LOG(ex))) / ex f2 = (c + 0.5_num - ratio) * f1 / ex bk1 = p0 + (d3 * f0 - f2 + f0 + blpha) / (f2 + f1 + f0) * p0 IF (ize == 1) bk1 = bk1 * EXP(-ex)