diff --git a/.github/workflows/lint-source.yml b/.github/workflows/lint-source.yml index f9f88228e7..68c07d6c18 100644 --- a/.github/workflows/lint-source.yml +++ b/.github/workflows/lint-source.yml @@ -42,6 +42,10 @@ jobs: run: | ! grep -iR -e '\.\.\.' -e '\-\-\-' -e '===' ./src/* + - name: Looking for false integers + run: | + ! grep -onRP '(? This procedure checks if two floating point numbers of wp are within tolerance. !! @param a First number. !! @param b Second number. - !! @param tol_input Relative error (default = 1e-10_wp). + !! @param tol_input Relative error (default = 1.e-10_wp). !! @return Result of the comparison. logical pure elemental function f_approx_equal(a, b, tol_input) result(res) !$acc routine seq @@ -32,7 +32,7 @@ logical pure elemental function f_approx_equal(a, b, tol_input) result(res) if (present(tol_input)) then tol = tol_input else - tol = 1e-10_wp + tol = 1.e-10_wp end if if (a == b) then diff --git a/src/common/m_phase_change.fpp b/src/common/m_phase_change.fpp index 2ccfa63659..d1dca0f6ca 100644 --- a/src/common/m_phase_change.fpp +++ b/src/common/m_phase_change.fpp @@ -343,8 +343,8 @@ contains ! Newton Solver for the pT-equilibrium ns = 0 - ! change this relative error metric. 1e4_wp is just arbitrary - do while ((abs(pS - pO) > palpha_eps) .and. (abs((pS - pO)/pO) > palpha_eps/1e4_wp) .or. (ns == 0)) + ! change this relative error metric. 1.e4_wp is just arbitrary + do while ((abs(pS - pO) > palpha_eps) .and. (abs((pS - pO)/pO) > palpha_eps/1.e4_wp) .or. (ns == 0)) ! increasing counter ns = ns + 1 @@ -438,7 +438,7 @@ contains R2D(1) = 0.0_wp; R2D(2) = 0.0_wp DeltamP(1) = 0.0_wp; DeltamP(2) = 0.0_wp do while (((sqrt(R2D(1)**2 + R2D(2)**2) > ptgalpha_eps) & - .and. ((sqrt(R2D(1)**2 + R2D(2)**2)/rhoe) > (ptgalpha_eps/1e6_wp))) & + .and. ((sqrt(R2D(1)**2 + R2D(2)**2)/rhoe) > (ptgalpha_eps/1.e6_wp))) & .or. (ns == 0)) ! Updating counter for the iterative procedure diff --git a/src/common/m_variables_conversion.fpp b/src/common/m_variables_conversion.fpp index 2d3eb6a3a5..949eac92cb 100644 --- a/src/common/m_variables_conversion.fpp +++ b/src/common/m_variables_conversion.fpp @@ -280,7 +280,7 @@ contains alpha_K(i) = min(max(0._wp, alpha_K(i)), 1._wp) end do - alpha_K = alpha_K/max(sum(alpha_K), 1e-16_wp) + alpha_K = alpha_K/max(sum(alpha_K), 1.e-16_wp) end if @@ -405,7 +405,7 @@ contains alpha_K(i) = min(max(0._wp, alpha_K(i)), 1._wp) end do - alpha_K = alpha_K/max(sum(alpha_K), 1e-16_wp) + alpha_K = alpha_K/max(sum(alpha_K), 1.e-16_wp) end if @@ -960,7 +960,7 @@ contains dW = -f/df_dW W = W + dW - if (abs(dW) < 1e-12*W) exit + if (abs(dW) < 1.e-12_wp*W) exit end do ! Recalculate pressure using converged W @@ -1014,7 +1014,7 @@ contains if (model_eqns /= 4) then qK_prim_vf(i)%sf(j, k, l) = qK_cons_vf(i)%sf(j, k, l) & /rho_K - dyn_pres_K = dyn_pres_K + 5e-1_wp*qK_cons_vf(i)%sf(j, k, l) & + dyn_pres_K = dyn_pres_K + 5.e-1_wp*qK_cons_vf(i)%sf(j, k, l) & *qK_prim_vf(i)%sf(j, k, l) else qK_prim_vf(i)%sf(j, k, l) = qK_cons_vf(i)%sf(j, k, l) & @@ -1520,11 +1520,11 @@ contains R_gas = gas_constant/mix_mol_weight T_K = pres_K/rho_K/R_gas call get_mixture_energy_mass(T_K, Y_K, E_K) - E_K = rho_K*E_K + 5e-1_wp*rho_K*vel_K_sum + E_K = rho_K*E_K + 5.e-1_wp*rho_K*vel_K_sum else ! Computing the energy from the pressure E_K = gamma_K*pres_K + pi_inf_K & - + 5e-1_wp*rho_K*vel_K_sum + qv_K + + 5.e-1_wp*rho_K*vel_K_sum + qv_K end if ! mass flux, this should be \alpha_i \rho_i u_i @@ -1659,7 +1659,7 @@ contains (rho*(1._wp - adv(num_fluids))) end if else - c = ((H - 5e-1*vel_sum)/gamma) + c = ((H - 5.e-1*vel_sum)/gamma) end if if (mixture_err .and. c < 0._wp) then diff --git a/src/post_process/m_data_output.fpp b/src/post_process/m_data_output.fpp index 3525b3c1e7..a6e7b12c24 100644 --- a/src/post_process/m_data_output.fpp +++ b/src/post_process/m_data_output.fpp @@ -1329,7 +1329,7 @@ contains rho = rho + adv(l)*q_prim_vf(l)%sf(i, j, k) end do - H = ((gamma + 1_wp)*pres + pi_inf)/rho + H = ((gamma + 1._wp)*pres + pi_inf)/rho call s_compute_speed_of_sound(pres, rho, & gamma, pi_inf, & diff --git a/src/post_process/m_derived_variables.fpp b/src/post_process/m_derived_variables.fpp index 6eaefe30a3..d3f27f6e81 100644 --- a/src/post_process/m_derived_variables.fpp +++ b/src/post_process/m_derived_variables.fpp @@ -212,7 +212,7 @@ contains end if if (mixture_err .and. q_sf(i, j, k) < 0._wp) then - q_sf(i, j, k) = 1e-16_wp + q_sf(i, j, k) = 1.e-16_wp else q_sf(i, j, k) = sqrt(q_sf(i, j, k)) end if @@ -285,8 +285,8 @@ contains end if end if - if (abs(top) < 1e-8_wp) top = 0._wp - if (abs(bottom) < 1e-8_wp) bottom = 0._wp + if (abs(top) < 1.e-8_wp) top = 0._wp + if (abs(bottom) < 1.e-8_wp) bottom = 0._wp if (f_approx_equal(top, bottom)) then slope = 1._wp @@ -295,20 +295,20 @@ contains ! (bottom == 0._wp .AND. top /= 0._wp)) THEN ! slope = 0._wp else - slope = (top*bottom)/(bottom**2._wp + 1e-16_wp) + slope = (top*bottom)/(bottom**2._wp + 1.e-16_wp) end if ! Flux limiter function if (flux_lim == 1) then ! MINMOD (MM) q_sf(j, k, l) = max(0._wp, min(1._wp, slope)) elseif (flux_lim == 2) then ! MUSCL (MC) - q_sf(j, k, l) = max(0._wp, min(2._wp*slope, 5e-1_wp*(1._wp + slope), 2._wp)) + q_sf(j, k, l) = max(0._wp, min(2._wp*slope, 5.e-1_wp*(1._wp + slope), 2._wp)) elseif (flux_lim == 3) then ! OSPRE (OP) - q_sf(j, k, l) = (15e-1_wp*(slope**2._wp + slope))/(slope**2._wp + slope + 1._wp) + q_sf(j, k, l) = (15.e-1_wp*(slope**2._wp + slope))/(slope**2._wp + slope + 1._wp) elseif (flux_lim == 4) then ! SUPERBEE (SB) q_sf(j, k, l) = max(0._wp, min(1._wp, 2._wp*slope), min(slope, 2._wp)) elseif (flux_lim == 5) then ! SWEBY (SW) (beta = 1.5) - q_sf(j, k, l) = max(0._wp, min(15e-1_wp*slope, 1._wp), min(slope, 15e-1_wp)) + q_sf(j, k, l) = max(0._wp, min(15.e-1_wp*slope, 1._wp), min(slope, 15.e-1_wp)) elseif (flux_lim == 6) then ! VAN ALBADA (VA) q_sf(j, k, l) = (slope**2._wp + slope)/(slope**2._wp + 1._wp) elseif (flux_lim == 7) then ! VAN LEER (VL) diff --git a/src/pre_process/include/2dHardcodedIC.fpp b/src/pre_process/include/2dHardcodedIC.fpp index e4bf547999..00c557a6f2 100644 --- a/src/pre_process/include/2dHardcodedIC.fpp +++ b/src/pre_process/include/2dHardcodedIC.fpp @@ -5,7 +5,7 @@ real(wp) :: rhoH, rhoL, pRef, pInt, h, lam, wl, amp, intH, intL, alph real(wp) :: factor - eps = 1e-9_wp + eps = 1.e-9_wp #:enddef @@ -35,7 +35,7 @@ if (r < rmax) then q_prim_vf(momxb)%sf(i, j, 0) = -(y_cc(j) - 0.5_wp)*umax/rmax q_prim_vf(momxe)%sf(i, j, 0) = (x_cc(i) - 0.5_wp)*umax/rmax - q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2/2._wp) + q_prim_vf(E_idx)%sf(i, j, 0) = p0 + umax**2*((r/rmax)**2._wp/2._wp) else if (r < 2*rmax) then q_prim_vf(momxb)%sf(i, j, 0) = -((y_cc(j) - 0.5_wp)/r)*umax*(2._wp - r/rmax) q_prim_vf(momxe)%sf(i, j, 0) = ((x_cc(i) - 0.5_wp)/r)*umax*(2._wp - r/rmax) diff --git a/src/pre_process/include/3dHardcodedIC.fpp b/src/pre_process/include/3dHardcodedIC.fpp index e0018598a7..02d4d95734 100644 --- a/src/pre_process/include/3dHardcodedIC.fpp +++ b/src/pre_process/include/3dHardcodedIC.fpp @@ -5,7 +5,7 @@ real(wp) :: eps - eps = 1e-9_wp + eps = 1.e-9_wp #:enddef #:def Hardcoded3D() @@ -23,7 +23,7 @@ intH = amp*(sin(2._wp*pi*x_cc(i)/lam - pi/2._wp) + sin(2._wp*pi*z_cc(k)/lam - pi/2._wp)) + h - alph = 5e-1_wp*(1._wp + tanh((y_cc(j) - intH)/2.5e-3_wp)) + alph = 5.e-1_wp*(1._wp + tanh((y_cc(j) - intH)/2.5e-3_wp)) if (alph < eps) alph = eps if (alph > 1._wp - eps) alph = 1._wp - eps diff --git a/src/pre_process/m_assign_variables.fpp b/src/pre_process/m_assign_variables.fpp index 30800aef66..3cf39533e4 100644 --- a/src/pre_process/m_assign_variables.fpp +++ b/src/pre_process/m_assign_variables.fpp @@ -181,7 +181,7 @@ contains end if ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(j, k, l) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(j, k, l) = patch_id end subroutine s_assign_patch_mixture_primitive_variables @@ -199,8 +199,8 @@ contains real(wp) :: pres_mag, loc, n_tait, B_tait, p0 real(wp) :: R3bar, n0, ratio, nH, vfH, velH, rhoH, deno - p0 = 101325 - pres_mag = 1e-1_wp + p0 = 101325._wp + pres_mag = 1.e-1_wp loc = x_cc(177) n_tait = fluid_pp(1)%gamma B_tait = fluid_pp(1)%pi_inf @@ -214,7 +214,7 @@ contains if (qbmm) then do i = 1, nb - q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l) = q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l)*((p0 - fluid_pp(1)%pv)/(q_prim_vf(E_idx)%sf(j, k, l)*p0 - fluid_pp(1)%pv))**(1/3._wp) + q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l) = q_prim_vf(bubxb + 1 + (i - 1)*nmom)%sf(j, k, l)*((p0 - fluid_pp(1)%pv)/(q_prim_vf(E_idx)%sf(j, k, l)*p0 - fluid_pp(1)%pv))**(1._wp/3._wp) end do end if @@ -687,7 +687,7 @@ contains end if ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(j, k, l) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(j, k, l) = patch_id end subroutine s_assign_patch_species_primitive_variables diff --git a/src/pre_process/m_grid.f90 b/src/pre_process/m_grid.f90 index 07277433d2..5467e61f79 100644 --- a/src/pre_process/m_grid.f90 +++ b/src/pre_process/m_grid.f90 @@ -62,7 +62,7 @@ impure subroutine s_generate_serial_grid dx = (x_domain%end - x_domain%beg)/real(m + 1, wp) do i = 0, m - x_cc(i) = x_domain%beg + 5e-1_wp*dx*real(2*i + 1, wp) + x_cc(i) = x_domain%beg + 5.e-1_wp*dx*real(2*i + 1, wp) x_cb(i - 1) = x_domain%beg + dx*real(i, wp) end do @@ -101,7 +101,7 @@ impure subroutine s_generate_serial_grid dy = (y_domain%end - y_domain%beg)/real(2*n + 1, wp) - y_cc(0) = y_domain%beg + 5e-1_wp*dy + y_cc(0) = y_domain%beg + 5.e-1_wp*dy y_cb(-1) = y_domain%beg do i = 1, n @@ -114,7 +114,7 @@ impure subroutine s_generate_serial_grid dy = (y_domain%end - y_domain%beg)/real(n + 1, wp) do i = 0, n - y_cc(i) = y_domain%beg + 5e-1_wp*dy*real(2*i + 1, wp) + y_cc(i) = y_domain%beg + 5.e-1_wp*dy*real(2*i + 1, wp) y_cb(i - 1) = y_domain%beg + dy*real(i, wp) end do @@ -153,7 +153,7 @@ impure subroutine s_generate_serial_grid dz = (z_domain%end - z_domain%beg)/real(p + 1, wp) do i = 0, p - z_cc(i) = z_domain%beg + 5e-1_wp*dz*real(2*i + 1, wp) + z_cc(i) = z_domain%beg + 5.e-1_wp*dz*real(2*i + 1, wp) z_cb(i - 1) = z_domain%beg + dz*real(i, wp) end do diff --git a/src/pre_process/m_model.fpp b/src/pre_process/m_model.fpp index e42c94a82f..3b94f0c2e9 100644 --- a/src/pre_process/m_model.fpp +++ b/src/pre_process/m_model.fpp @@ -1055,8 +1055,8 @@ contains t_vec3 :: dist_buffer !< Distance between the cell center and the vertices integer :: i, j, tri_idx !< Iterator - dist_min = 1e12_wp - dist_min_normal = 1e12_wp + dist_min = 1.e12_wp + dist_min_normal = 1.e12_wp distance = 0._wp tri_idx = 0 diff --git a/src/pre_process/m_patches.fpp b/src/pre_process/m_patches.fpp index d4703ab40f..f3ed4bfb49 100644 --- a/src/pre_process/m_patches.fpp +++ b/src/pre_process/m_patches.fpp @@ -290,7 +290,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, 0, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, 0, 0) = patch_id end if end do @@ -354,7 +354,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id end if end do end do @@ -825,7 +825,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id q_prim_vf(alf_idx)%sf(i, j, 0) = patch_icpp(patch_id)%alpha(1)* & exp(-0.5_wp*((myr - radius)**2._wp)/(thickness/3._wp)**2._wp) @@ -888,7 +888,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id q_prim_vf(alf_idx)%sf(i, j, k) = patch_icpp(patch_id)%alpha(1)* & exp(-0.5_wp*((myr - radius)**2._wp)/(thickness/3._wp)**2._wp) @@ -959,7 +959,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id end if end do end do @@ -1039,7 +1039,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id end if end do end do @@ -1129,7 +1129,7 @@ contains end if ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id end if end if @@ -1182,9 +1182,9 @@ contains do i = 0, m if (patch_icpp(patch_id)%smoothen) then - eta = 5e-1_wp + 5e-1_wp*tanh(smooth_coeff/min(dx, dy) & - *(a*x_cc(i) + b*y_cc(j) + c) & - /sqrt(a**2 + b**2)) + eta = 5.e-1_wp + 5.e-1_wp*tanh(smooth_coeff/min(dx, dy) & + *(a*x_cc(i) + b*y_cc(j) + c) & + /sqrt(a**2 + b**2)) end if if ((a*x_cc(i) + b*y_cc(j) + c >= 0._wp & @@ -1199,7 +1199,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id end if end do @@ -1269,7 +1269,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id ! Assign Parameters q_prim_vf(mom_idx%beg)%sf(i, j, 0) = U0*sin(x_cc(i)/L0)*cos(y_cc(j)/L0) @@ -1336,7 +1336,7 @@ contains @:Hardcoded1D() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, 0, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, 0, 0) = patch_id end if end do @@ -1459,7 +1459,7 @@ contains @:Hardcoded2D() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, 0) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, 0) = patch_id end if end do @@ -1541,7 +1541,7 @@ contains @:Hardcoded3D() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id end if @@ -1874,7 +1874,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id end if end if @@ -2028,7 +2028,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id end if end if end do @@ -2090,11 +2090,11 @@ contains end if if (patch_icpp(patch_id)%smoothen) then - eta = 5e-1_wp + 5e-1_wp*tanh(smooth_coeff/min(dx, dy, dz) & - *(a*x_cc(i) + & - b*cart_y + & - c*cart_z + d) & - /sqrt(a**2 + b**2 + c**2)) + eta = 5.e-1_wp + 5.e-1_wp*tanh(smooth_coeff/min(dx, dy, dz) & + *(a*x_cc(i) + & + b*cart_y + & + c*cart_z + d) & + /sqrt(a**2 + b**2 + c**2)) end if if ((a*x_cc(i) + b*cart_y + c*cart_z + d >= 0._wp & @@ -2110,7 +2110,7 @@ contains @:analytical() ! Updating the patch identities bookkeeping variable - if (1._wp - eta < 1e-16_wp) patch_id_fp(i, j, k) = patch_id + if (1._wp - eta < 1.e-16_wp) patch_id_fp(i, j, k) = patch_id end if end do @@ -2241,11 +2241,11 @@ contains !call s_model_write("__out__.stl", model) !call s_model_write("__out__.obj", model) - grid_mm(1, :) = (/minval(x_cc) - 0e5_wp*dx, maxval(x_cc) + 0e5_wp*dx/) - grid_mm(2, :) = (/minval(y_cc) - 0e5_wp*dy, maxval(y_cc) + 0e5_wp*dy/) + grid_mm(1, :) = (/minval(x_cc) - 0.e5_wp*dx, maxval(x_cc) + 0.e5_wp*dx/) + grid_mm(2, :) = (/minval(y_cc) - 0.e5_wp*dy, maxval(y_cc) + 0.e5_wp*dy/) if (p > 0) then - grid_mm(3, :) = (/minval(z_cc) - 0e5_wp*dz, maxval(z_cc) + 0e5_wp*dz/) + grid_mm(3, :) = (/minval(z_cc) - 0.e5_wp*dz, maxval(z_cc) + 0.e5_wp*dz/) else grid_mm(3, :) = (/0._wp, 0._wp/) end if diff --git a/src/pre_process/m_perturbation.fpp b/src/pre_process/m_perturbation.fpp index 15e12dfe6e..0bfef5da83 100644 --- a/src/pre_process/m_perturbation.fpp +++ b/src/pre_process/m_perturbation.fpp @@ -199,7 +199,7 @@ contains f0 = (Ca + 2._wp/Web)*(fR0/fR)**(3._wp*gam_b) - 2._wp/(Web*fR) + 1._wp - Ca - fP f1 = -3._wp*gam_b*(Ca + 2._wp/Web)*(fR0/fR)**(3._wp*gam_b + 1._wp) + 2._wp/(Web*fR**2._wp) - if (abs(f0) <= 1e-10_wp) then + if (abs(f0) <= 1.e-10_wp) then ! Converged exit else @@ -589,8 +589,8 @@ contains xci = 0._wp do i = 1, mixlayer_nvar do k = 0, n - xcr((i - 1)*(nbp - 1) + k) = 5e-1_wp*(xbr((i - 1)*nbp + k) + xbr((i - 1)*nbp + k + 1)) - xci((i - 1)*(nbp - 1) + k) = 5e-1_wp*(xbi((i - 1)*nbp + k) + xbi((i - 1)*nbp + k + 1)) + xcr((i - 1)*(nbp - 1) + k) = 5.e-1_wp*(xbr((i - 1)*nbp + k) + xbr((i - 1)*nbp + k + 1)) + xci((i - 1)*(nbp - 1) + k) = 5.e-1_wp*(xbi((i - 1)*nbp + k) + xbi((i - 1)*nbp + k + 1)) end do end do diff --git a/src/simulation/include/inline_riemann.fpp b/src/simulation/include/inline_riemann.fpp index 9ad956a2c8..714ec3ef21 100644 --- a/src/simulation/include/inline_riemann.fpp +++ b/src/simulation/include/inline_riemann.fpp @@ -1,13 +1,13 @@ #:def arithmetic_avg() - rho_avg = 5e-1_wp*(rho_L + rho_R) + rho_avg = 5.e-1_wp*(rho_L + rho_R) vel_avg_rms = 0._wp !$acc loop seq do i = 1, num_vels - vel_avg_rms = vel_avg_rms + (5e-1_wp*(vel_L(i) + vel_R(i)))**2._wp + vel_avg_rms = vel_avg_rms + (5.e-1_wp*(vel_L(i) + vel_R(i)))**2._wp end do - H_avg = 5e-1_wp*(H_L + H_R) - gamma_avg = 5e-1_wp*(gamma_L + gamma_R) + H_avg = 5.e-1_wp*(H_L + H_R) + gamma_avg = 5.e-1_wp*(gamma_L + gamma_R) #:enddef arithmetic_avg @@ -80,7 +80,7 @@ if (riemann_solver == 1) then - zcoef = min(1._wp, max(vel_L_rms**5e-1_wp/c_L, vel_R_rms**5e-1_wp/c_R)) + zcoef = min(1._wp, max(vel_L_rms**5.e-1_wp/c_L, vel_R_rms**5.e-1_wp/c_R)) pcorr = 0._wp if (low_Mach == 1) then @@ -88,7 +88,7 @@ end if else if (riemann_solver == 2) then - zcoef = min(1._wp, max(vel_L_rms**5e-1_wp/c_L, vel_R_rms**5e-1_wp/c_R)) + zcoef = min(1._wp, max(vel_L_rms**5.e-1_wp/c_L, vel_R_rms**5.e-1_wp/c_R)) pcorr = 0._wp if (low_Mach == 1) then @@ -97,8 +97,8 @@ (rho_R*(s_R - vel_R(dir_idx(1))) - rho_L*(s_L - vel_L(dir_idx(1))))* & (zcoef - 1._wp) else if (low_Mach == 2) then - vel_L_tmp = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + zcoef*(vel_L(dir_idx(1)) - vel_R(dir_idx(1)))) - vel_R_tmp = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + zcoef*(vel_R(dir_idx(1)) - vel_L(dir_idx(1)))) + vel_L_tmp = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + zcoef*(vel_L(dir_idx(1)) - vel_R(dir_idx(1)))) + vel_R_tmp = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + zcoef*(vel_R(dir_idx(1)) - vel_L(dir_idx(1)))) vel_L(dir_idx(1)) = vel_L_tmp vel_R(dir_idx(1)) = vel_R_tmp end if diff --git a/src/simulation/m_acoustic_src.fpp b/src/simulation/m_acoustic_src.fpp index 0205e4043b..5f7e986d89 100644 --- a/src/simulation/m_acoustic_src.fpp +++ b/src/simulation/m_acoustic_src.fpp @@ -388,8 +388,8 @@ contains source = mag(ai)*sign(1._wp, sine_wave) ! Prevent max-norm differences due to compilers to pass CI - if (abs(sine_wave) < 1e-2_wp) then - source = mag(ai)*sine_wave*1e2_wp + if (abs(sine_wave) < 1.e-2_wp) then + source = mag(ai)*sine_wave*1.e2_wp end if elseif (pulse(ai) == 4) then ! Broadband wave @@ -403,7 +403,7 @@ contains integer :: count integer :: dim real(wp) :: source_spatial, angle, xyz_to_r_ratios(3) - real(wp), parameter :: threshold = 1e-10_wp + real(wp), parameter :: threshold = 1.e-10_wp if (n == 0) then dim = 1 diff --git a/src/simulation/m_bubbles.fpp b/src/simulation/m_bubbles.fpp index 187d78c2c0..79ca5fb982 100644 --- a/src/simulation/m_bubbles.fpp +++ b/src/simulation/m_bubbles.fpp @@ -643,7 +643,7 @@ contains d_norms(3) = sqrt(((myV_tmp(2) - myV_tmp(1))**2._wp + (myA_tmp(2) - myA_tmp(1))**2._wp)/2._wp)/h_size(1) ! Set h1 = (0.01/max(d_1,d_2))^{1/(p+1)} - ! if max(d_1,d_2) < 1e-15_wp, h_size(2) = max(1e-6_wp, h0*1e-3_wp) + ! if max(d_1,d_2) < 1.e-15_wp, h_size(2) = max(1.e-6_wp, h0*1.e-3_wp) if (max(d_norms(2), d_norms(3)) < threshold_second_guess) then h_size(2) = max(small_guess, h_size(1)*scale_first_guess) else diff --git a/src/simulation/m_bubbles_EE.fpp b/src/simulation/m_bubbles_EE.fpp index 47558229ea..ed3f064551 100644 --- a/src/simulation/m_bubbles_EE.fpp +++ b/src/simulation/m_bubbles_EE.fpp @@ -109,8 +109,8 @@ contains do j = 0, m divu%sf(j, k, l) = 0._wp divu%sf(j, k, l) = & - 5e-1_wp/dx(j)*(q_prim_vf(contxe + idir)%sf(j + 1, k, l) - & - q_prim_vf(contxe + idir)%sf(j - 1, k, l)) + 5.e-1_wp/dx(j)*(q_prim_vf(contxe + idir)%sf(j + 1, k, l) - & + q_prim_vf(contxe + idir)%sf(j - 1, k, l)) end do end do @@ -124,8 +124,8 @@ contains do k = 0, n do j = 0, m divu%sf(j, k, l) = divu%sf(j, k, l) + & - 5e-1_wp/dy(k)*(q_prim_vf(contxe + idir)%sf(j, k + 1, l) - & - q_prim_vf(contxe + idir)%sf(j, k - 1, l)) + 5.e-1_wp/dy(k)*(q_prim_vf(contxe + idir)%sf(j, k + 1, l) - & + q_prim_vf(contxe + idir)%sf(j, k - 1, l)) end do end do @@ -138,8 +138,8 @@ contains do k = 0, n do j = 0, m divu%sf(j, k, l) = divu%sf(j, k, l) + & - 5e-1_wp/dz(l)*(q_prim_vf(contxe + idir)%sf(j, k, l + 1) - & - q_prim_vf(contxe + idir)%sf(j, k, l - 1)) + 5.e-1_wp/dz(l)*(q_prim_vf(contxe + idir)%sf(j, k, l + 1) - & + q_prim_vf(contxe + idir)%sf(j, k, l - 1)) end do end do diff --git a/src/simulation/m_cbc.fpp b/src/simulation/m_cbc.fpp index 665fc6b34b..6fb5438a2f 100644 --- a/src/simulation/m_cbc.fpp +++ b/src/simulation/m_cbc.fpp @@ -489,7 +489,7 @@ contains fd_coef_${XYZ}$ (:, cbc_loc_in) = 0._wp fd_coef_${XYZ}$ (0, cbc_loc_in) = -50._wp/(25._wp*ds(0) + 2._wp*ds(1) & - - 1e1_wp*ds(2) + 1e1_wp*ds(3) & + - 1.e1_wp*ds(2) + 1.e1_wp*ds(3) & - 3._wp*ds(4)) fd_coef_${XYZ}$ (1, cbc_loc_in) = -48._wp*fd_coef_${XYZ}$ (0, cbc_loc_in)/25._wp fd_coef_${XYZ}$ (2, cbc_loc_in) = 36._wp*fd_coef_${XYZ}$ (0, cbc_loc_in)/25._wp @@ -816,7 +816,7 @@ contains T = pres/rho/R_gas call get_mixture_specific_heat_cp_mass(T, Ys, Cp) call get_mixture_energy_mass(T, Ys, e_mix) - E = rho*e_mix + 5e-1_wp*rho*vel_K_sum + E = rho*e_mix + 5.e-1_wp*rho*vel_K_sum if (chem_params%gamma_method == 1) then !> gamma_method = 1: Ref. Section 2.3.1 Formulation of doi:10.7907/ZKW8-ES97. call get_mole_fractions(Mw, Ys, Xs) @@ -829,7 +829,7 @@ contains gamma = 1.0_wp/(Cp/Cv - 1.0_wp) end if else - E = gamma*pres + pi_inf + 5e-1_wp*rho*vel_K_sum + E = gamma*pres + pi_inf + 5.e-1_wp*rho*vel_K_sum end if H = (E + pres)/rho @@ -960,10 +960,10 @@ contains ! Be careful about the cylindrical coordinate! if (cyl_coord .and. cbc_dir == 2 .and. cbc_loc == 1) then - dpres_dt = -5e-1_wp*(L(advxe) + L(1)) + rho*c*c*vel(dir_idx(1)) & + dpres_dt = -5.e-1_wp*(L(advxe) + L(1)) + rho*c*c*vel(dir_idx(1)) & /y_cc(n) else - dpres_dt = -5e-1_wp*(L(advxe) + L(1)) + dpres_dt = -5.e-1_wp*(L(advxe) + L(1)) end if !$acc loop seq @@ -1059,7 +1059,7 @@ contains + dpi_inf_dt & + dqv_dt & + rho*vel_dv_dt_sum & - + 5e-1_wp*drho_dt*vel_K_sum) + + 5.e-1_wp*drho_dt*vel_K_sum) end if if (riemann_solver == 1) then diff --git a/src/simulation/m_compute_cbc.fpp b/src/simulation/m_compute_cbc.fpp index 47b3f9ce81..022a06175d 100644 --- a/src/simulation/m_compute_cbc.fpp +++ b/src/simulation/m_compute_cbc.fpp @@ -116,16 +116,16 @@ contains real(wp), dimension(num_species), intent(in) :: dYs_ds real(wp) :: lambda_factor - lambda_factor = (5e-1_wp - 5e-1_wp*sign(1._wp, lambda(1))) + lambda_factor = (5.e-1_wp - 5.e-1_wp*sign(1._wp, lambda(1))) L(1) = lambda_factor*lambda(1)*(dpres_ds - rho*c*dvel_ds(dir_idx(1))) - lambda_factor = (5e-1_wp - 5e-1_wp*sign(1._wp, lambda(2))) + lambda_factor = (5.e-1_wp - 5.e-1_wp*sign(1._wp, lambda(2))) call s_fill_density_L(L, lambda_factor, lambda(2), c, mf, dalpha_rho_ds, dpres_ds) call s_fill_velocity_L(L, lambda_factor, lambda(2), dvel_ds) call s_fill_advection_L(L, lambda_factor, lambda(2), dadv_ds) call s_fill_chemistry_L(L, lambda_factor, lambda(2), dYs_ds) - lambda_factor = (5e-1_wp - 5e-1_wp*sign(1._wp, lambda(3))) + lambda_factor = (5.e-1_wp - 5.e-1_wp*sign(1._wp, lambda(3))) L(advxe) = lambda_factor*lambda(3)*(dpres_ds + rho*c*dvel_ds(dir_idx(1))) end subroutine s_compute_nonreflecting_subsonic_buffer_L diff --git a/src/simulation/m_data_output.fpp b/src/simulation/m_data_output.fpp index a0cc35fbbd..4a2e37a95c 100644 --- a/src/simulation/m_data_output.fpp +++ b/src/simulation/m_data_output.fpp @@ -1765,7 +1765,7 @@ contains @:ALLOCATE(Rc_sf (0:m, 0:n, 0:p)) vcfl_max = 0._wp - Rc_min = 1e3_wp + Rc_min = 1.e3_wp end if end subroutine s_initialize_data_output_module diff --git a/src/simulation/m_hyperelastic.fpp b/src/simulation/m_hyperelastic.fpp index c458ea0c04..0aed395e8e 100644 --- a/src/simulation/m_hyperelastic.fpp +++ b/src/simulation/m_hyperelastic.fpp @@ -121,7 +121,7 @@ contains alpha_rho_k, Re, G, Gs) rho = max(rho, sgm_eps) G = max(G, sgm_eps) - !if ( G <= verysmall ) G_K = 0_wp + !if ( G <= verysmall ) G_K = 0._wp if (G > verysmall) then !$acc loop seq diff --git a/src/simulation/m_ibm.fpp b/src/simulation/m_ibm.fpp index 806b45c2da..9120c18b16 100644 --- a/src/simulation/m_ibm.fpp +++ b/src/simulation/m_ibm.fpp @@ -642,13 +642,13 @@ contains interp_coeffs = 0._wp - if (dist(1, 1, 1) <= 1e-16_wp) then + if (dist(1, 1, 1) <= 1.e-16_wp) then interp_coeffs(1, 1, 1) = 1._wp - else if (dist(2, 1, 1) <= 1e-16_wp) then + else if (dist(2, 1, 1) <= 1.e-16_wp) then interp_coeffs(2, 1, 1) = 1._wp - else if (dist(1, 2, 1) <= 1e-16_wp) then + else if (dist(1, 2, 1) <= 1.e-16_wp) then interp_coeffs(1, 2, 1) = 1._wp - else if (dist(2, 2, 1) <= 1e-16_wp) then + else if (dist(2, 2, 1) <= 1.e-16_wp) then interp_coeffs(2, 2, 1) = 1._wp else eta(:, :, 1) = 1._wp/dist(:, :, 1)**2 @@ -713,21 +713,21 @@ contains (z_cc(k2) - gp%ip_loc(3))**2) interp_coeffs = 0._wp buf = 1._wp - if (dist(1, 1, 1) <= 1e-16_wp) then + if (dist(1, 1, 1) <= 1.e-16_wp) then interp_coeffs(1, 1, 1) = 1._wp - else if (dist(2, 1, 1) <= 1e-16_wp) then + else if (dist(2, 1, 1) <= 1.e-16_wp) then interp_coeffs(2, 1, 1) = 1._wp - else if (dist(1, 2, 1) <= 1e-16_wp) then + else if (dist(1, 2, 1) <= 1.e-16_wp) then interp_coeffs(1, 2, 1) = 1._wp - else if (dist(2, 2, 1) <= 1e-16_wp) then + else if (dist(2, 2, 1) <= 1.e-16_wp) then interp_coeffs(2, 2, 1) = 1._wp - else if (dist(1, 1, 2) <= 1e-16_wp) then + else if (dist(1, 1, 2) <= 1.e-16_wp) then interp_coeffs(1, 1, 2) = 1._wp - else if (dist(2, 1, 2) <= 1e-16_wp) then + else if (dist(2, 1, 2) <= 1.e-16_wp) then interp_coeffs(2, 1, 2) = 1._wp - else if (dist(1, 2, 2) <= 1e-16_wp) then + else if (dist(1, 2, 2) <= 1.e-16_wp) then interp_coeffs(1, 2, 2) = 1._wp - else if (dist(2, 2, 2) <= 1e-16_wp) then + else if (dist(2, 2, 2) <= 1.e-16_wp) then interp_coeffs(2, 2, 2) = 1._wp else eta = 1._wp/dist**2 diff --git a/src/simulation/m_pressure_relaxation.fpp b/src/simulation/m_pressure_relaxation.fpp index 8aa78ad88a..ced668bef2 100644 --- a/src/simulation/m_pressure_relaxation.fpp +++ b/src/simulation/m_pressure_relaxation.fpp @@ -159,7 +159,7 @@ contains real(wp) :: pres_relax, f_pres, df_pres real(wp), dimension(num_fluids) :: pres_K_init, rho_K_s integer, parameter :: MAX_ITER = 50 - real(wp), parameter :: TOLERANCE = 1e-10_wp + real(wp), parameter :: TOLERANCE = 1.e-10_wp integer :: iter, i ! Initialize pressures @@ -169,8 +169,8 @@ contains if (q_cons_vf(i + advxb - 1)%sf(j, k, l) > sgm_eps) then pres_K_init(i) = (q_cons_vf(i + intxb - 1)%sf(j, k, l)/ & q_cons_vf(i + advxb - 1)%sf(j, k, l) - pi_infs(i))/gammas(i) - if (pres_K_init(i) <= -(1._wp - 1e-8_wp)*pres_inf(i) + 1e-8_wp) & - pres_K_init(i) = -(1._wp - 1e-8_wp)*pres_inf(i) + 1e-8_wp + if (pres_K_init(i) <= -(1._wp - 1.e-8_wp)*pres_inf(i) + 1.e-8_wp) & + pres_K_init(i) = -(1._wp - 1.e-8_wp)*pres_inf(i) + 1.e-8_wp else pres_K_init(i) = 0._wp end if @@ -178,8 +178,8 @@ contains end do ! Newton-Raphson iteration - f_pres = 1e-9_wp - df_pres = 1e9_wp + f_pres = 1.e-9_wp + df_pres = 1.e9_wp !$acc loop seq do iter = 0, MAX_ITER - 1 if (abs(f_pres) > TOLERANCE) then @@ -187,8 +187,8 @@ contains ! Enforce pressure bounds do i = 1, num_fluids - if (pres_relax <= -(1._wp - 1e-8_wp)*pres_inf(i) + 1e-8_wp) & - pres_relax = -(1._wp - 1e-8_wp)*pres_inf(i) + 1._wp + if (pres_relax <= -(1._wp - 1.e-8_wp)*pres_inf(i) + 1.e-8_wp) & + pres_relax = -(1._wp - 1.e-8_wp)*pres_inf(i) + 1._wp end do ! Newton-Raphson step @@ -298,7 +298,7 @@ contains dyn_pres = 0._wp !$acc loop seq do i = momxb, momxe - dyn_pres = dyn_pres + 5e-1_wp*q_cons_vf(i)%sf(j, k, l)* & + dyn_pres = dyn_pres + 5.e-1_wp*q_cons_vf(i)%sf(j, k, l)* & q_cons_vf(i)%sf(j, k, l)/max(rho, sgm_eps) end do diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fpp index 6a7a96cd08..8aceb2dfb4 100644 --- a/src/simulation/m_rhs.fpp +++ b/src/simulation/m_rhs.fpp @@ -1054,7 +1054,7 @@ contains if (cyl_coord) then rhs_vf(i_fluid_loop + intxb - 1)%sf(q, k, l) = & rhs_vf(i_fluid_loop + intxb - 1)%sf(q, k, l) - & - 5e-1_wp/y_cc(k)*advected_qty_val*pressure_val*(flux_face1 + flux_face2) + 5.e-1_wp/y_cc(k)*advected_qty_val*pressure_val*(flux_face1 + flux_face2) end if end do end do @@ -1071,7 +1071,7 @@ contains flux_face1 = flux_gsrc_n(2)%vf(j)%sf(q, k - 1, l) flux_face2 = flux_gsrc_n(2)%vf(j)%sf(q, k, l) rhs_vf(j)%sf(q, k, l) = rhs_vf(j)%sf(q, k, l) - & - 5e-1_wp/y_cc(k)*(flux_face1 + flux_face2) + 5.e-1_wp/y_cc(k)*(flux_face1 + flux_face2) end do end do end do @@ -1113,7 +1113,7 @@ contains flux_face1 = flux_gsrc_n(3)%vf(j)%sf(l, q, k - 1) flux_face2 = flux_gsrc_n(3)%vf(j)%sf(l, q, k) rhs_vf(j)%sf(l, q, k) = rhs_vf(j)%sf(l, q, k) - & - 5e-1_wp/y_cc(q)*(flux_face1 + flux_face2) + 5.e-1_wp/y_cc(q)*(flux_face1 + flux_face2) end do end do end do @@ -1523,7 +1523,7 @@ contains !$acc loop seq do i = momxb, E_idx rhs_vf(i)%sf(j, k, l) = & - rhs_vf(i)%sf(j, k, l) - 5e-1_wp/y_cc(k)* & + rhs_vf(i)%sf(j, k, l) - 5.e-1_wp/y_cc(k)* & (flux_src_n(i)%sf(j, k - 1, l) & + flux_src_n(i)%sf(j, k, l)) end do @@ -1553,7 +1553,7 @@ contains !$acc loop seq do i = momxb, E_idx rhs_vf(i)%sf(j, k, l) = & - rhs_vf(i)%sf(j, k, l) - 5e-1_wp/y_cc(k)* & + rhs_vf(i)%sf(j, k, l) - 5.e-1_wp/y_cc(k)* & (flux_src_n(i)%sf(j, k - 1, l) & + flux_src_n(i)%sf(j, k, l)) end do @@ -1602,12 +1602,12 @@ contains do k = 0, n do j = 0, m rhs_vf(momxb + 1)%sf(j, k, l) = & - rhs_vf(momxb + 1)%sf(j, k, l) + 5e-1_wp* & + rhs_vf(momxb + 1)%sf(j, k, l) + 5.e-1_wp* & (flux_src_n(momxe)%sf(j, k, l - 1) & + flux_src_n(momxe)%sf(j, k, l)) rhs_vf(momxe)%sf(j, k, l) = & - rhs_vf(momxe)%sf(j, k, l) - 5e-1_wp* & + rhs_vf(momxe)%sf(j, k, l) - 5.e-1_wp* & (flux_src_n(momxb + 1)%sf(j, k, l - 1) & + flux_src_n(momxb + 1)%sf(j, k, l)) end do diff --git a/src/simulation/m_riemann_solvers.fpp b/src/simulation/m_riemann_solvers.fpp index b3564003c2..9c65e51e29 100644 --- a/src/simulation/m_riemann_solvers.fpp +++ b/src/simulation/m_riemann_solvers.fpp @@ -543,8 +543,8 @@ contains call get_mixture_energy_mass(T_L, Ys_L, E_L) call get_mixture_energy_mass(T_R, Ys_R, E_R) - E_L = rho_L*E_L + 5e-1*rho_L*vel_L_rms - E_R = rho_R*E_R + 5e-1*rho_R*vel_R_rms + E_L = rho_L*E_L + 5.e-1*rho_L*vel_L_rms + E_R = rho_R*E_R + 5.e-1*rho_R*vel_R_rms H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R elseif (mhd .and. relativity) then @@ -586,8 +586,8 @@ contains H_L = (E_L + pres_L - pres_mag%L)/rho_L H_R = (E_R + pres_R - pres_mag%R)/rho_R ! stagnation enthalpy here excludes magnetic energy (only used to find speed of sound) else - E_L = gamma_L*pres_L + pi_inf_L + 5e-1*rho_L*vel_L_rms + qv_L - E_R = gamma_R*pres_R + pi_inf_R + 5e-1*rho_R*vel_R_rms + qv_R + E_L = gamma_L*pres_L + pi_inf_L + 5.e-1*rho_L*vel_L_rms + qv_L + E_R = gamma_R*pres_R + pi_inf_R + 5.e-1*rho_R*vel_R_rms + qv_R H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R end if @@ -635,7 +635,7 @@ contains ! G_R = G_R + alpha_R(i)*Gs(i) ! end do ! ! Elastic contribution to energy if G large enough - ! if ((G_L > 1e-3_wp) .and. (G_R > 1e-3_wp)) then + ! if ((G_L > 1.e-3_wp) .and. (G_R > 1.e-3_wp)) then ! E_L = E_L + G_L*qL_prim_rs${XYZ}$_vf(j, k, l, xiend + 1) ! E_R = E_R + G_R*qR_prim_rs${XYZ}$_vf(j + 1, k, l, xiend + 1) ! !$acc loop seq @@ -700,10 +700,10 @@ contains (((4._wp*G_L)/3._wp) + & tau_e_L(dir_idx_tau(1)))/rho_L)) else if (hyperelasticity) then - s_L = min(vel_L(dir_idx(1)) - sqrt(c_L*c_L + (4._wp*G_L/3_wp)/rho_L) & - , vel_R(dir_idx(1)) - sqrt(c_R*c_R + (4._wp*G_R/3_wp)/rho_R)) - s_R = max(vel_R(dir_idx(1)) + sqrt(c_R*c_R + (4._wp*G_R/3_wp)/rho_R) & - , vel_L(dir_idx(1)) + sqrt(c_L*c_L + (4._wp*G_L/3_wp)/rho_L)) + s_L = min(vel_L(dir_idx(1)) - sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L) & + , vel_R(dir_idx(1)) - sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R)) + s_R = max(vel_R(dir_idx(1)) + sqrt(c_R*c_R + (4._wp*G_R/3._wp)/rho_R) & + , vel_L(dir_idx(1)) + sqrt(c_L*c_L + (4._wp*G_L/3._wp)/rho_L)) else s_L = min(vel_L(dir_idx(1)) - c_L, vel_R(dir_idx(1)) - c_R) s_R = max(vel_R(dir_idx(1)) + c_R, vel_L(dir_idx(1)) + c_L) @@ -716,35 +716,35 @@ contains /(rho_L*(s_L - vel_L(dir_idx(1))) - & rho_R*(s_R - vel_R(dir_idx(1)))) elseif (wave_speeds == 2) then - pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & - (vel_L(dir_idx(1)) - & - vel_R(dir_idx(1)))) + pres_SL = 5.e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & + (vel_L(dir_idx(1)) - & + vel_R(dir_idx(1)))) pres_SR = pres_SL - Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* & + Ms_L = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_L)/(1._wp + gamma_L))* & (pres_SL/pres_L - 1._wp)*pres_L/ & ((pres_L + pi_inf_L/(1._wp + gamma_L))))) - Ms_R = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_R)/(1._wp + gamma_R))* & + Ms_R = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_R)/(1._wp + gamma_R))* & (pres_SR/pres_R - 1._wp)*pres_R/ & ((pres_R + pi_inf_R/(1._wp + gamma_R))))) s_L = vel_L(dir_idx(1)) - c_L*Ms_L s_R = vel_R(dir_idx(1)) + c_R*Ms_R - s_S = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & - (pres_L - pres_R)/ & - (rho_avg*c_avg)) + s_S = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & + (pres_L - pres_R)/ & + (rho_avg*c_avg)) end if s_M = min(0._wp, s_L); s_P = max(0._wp, s_R) - xi_M = (5e-1_wp + sign(5e-1_wp, s_L)) & - + (5e-1_wp - sign(5e-1_wp, s_L)) & - *(5e-1_wp + sign(5e-1_wp, s_R)) - xi_P = (5e-1_wp - sign(5e-1_wp, s_R)) & - + (5e-1_wp - sign(5e-1_wp, s_L)) & - *(5e-1_wp + sign(5e-1_wp, s_R)) + xi_M = (5.e-1_wp + sign(5.e-1_wp, s_L)) & + + (5.e-1_wp - sign(5.e-1_wp, s_L)) & + *(5.e-1_wp + sign(5.e-1_wp, s_R)) + xi_P = (5.e-1_wp - sign(5.e-1_wp, s_R)) & + + (5.e-1_wp - sign(5.e-1_wp, s_L)) & + *(5.e-1_wp + sign(5.e-1_wp, s_R)) ! Low Mach correction if (low_Mach == 1) then @@ -1401,9 +1401,9 @@ contains end do end if - E_L = gamma_L*pres_L + pi_inf_L + 5e-1_wp*rho_L*vel_L_rms + qv_L + E_L = gamma_L*pres_L + pi_inf_L + 5.e-1_wp*rho_L*vel_L_rms + qv_L - E_R = gamma_R*pres_R + pi_inf_R + 5e-1_wp*rho_R*vel_R_rms + qv_R + E_R = gamma_R*pres_R + pi_inf_R + 5.e-1_wp*rho_R*vel_R_rms + qv_R ! ENERGY ADJUSTMENTS FOR HYPOELASTIC ENERGY if (hypoelasticity) then @@ -1491,11 +1491,11 @@ contains if (wave_speeds == 1) then if (elasticity) then s_L = min(vel_L(dir_idx(1)) - sqrt(c_L*c_L + & - (((4._wp*G_L)/3_wp) + tau_e_L(dir_idx_tau(1)))/rho_L), vel_R(dir_idx(1)) - sqrt(c_R*c_R + & - (((4._wp*G_R)/3_wp) + tau_e_R(dir_idx_tau(1)))/rho_R)) + (((4._wp*G_L)/3._wp) + tau_e_L(dir_idx_tau(1)))/rho_L), vel_R(dir_idx(1)) - sqrt(c_R*c_R + & + (((4._wp*G_R)/3._wp) + tau_e_R(dir_idx_tau(1)))/rho_R)) s_R = max(vel_R(dir_idx(1)) + sqrt(c_R*c_R + & - (((4._wp*G_R)/3_wp) + tau_e_R(dir_idx_tau(1)))/rho_R), vel_L(dir_idx(1)) + sqrt(c_L*c_L + & - (((4._wp*G_L)/3_wp) + tau_e_L(dir_idx_tau(1)))/rho_L)) + (((4._wp*G_R)/3._wp) + tau_e_R(dir_idx_tau(1)))/rho_R), vel_L(dir_idx(1)) + sqrt(c_L*c_L + & + (((4._wp*G_L)/3._wp) + tau_e_L(dir_idx_tau(1)))/rho_L)) s_S = (pres_R - tau_e_R(dir_idx_tau(1)) - pres_L + & tau_e_L(dir_idx_tau(1)) + rho_L*vel_L(idx1)*(s_L - vel_L(idx1)) - & rho_R*vel_R(idx1)*(s_R - vel_R(idx1)))/(rho_L*(s_L - vel_L(idx1)) - & @@ -1509,25 +1509,25 @@ contains end if elseif (wave_speeds == 2) then - pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & - (vel_L(dir_idx(1)) - & - vel_R(dir_idx(1)))) + pres_SL = 5.e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & + (vel_L(dir_idx(1)) - & + vel_R(dir_idx(1)))) pres_SR = pres_SL - Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* & + Ms_L = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_L)/(1._wp + gamma_L))* & (pres_SL/pres_L - 1._wp)*pres_L/ & ((pres_L + pi_inf_L/(1._wp + gamma_L))))) - Ms_R = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_R)/(1._wp + gamma_R))* & + Ms_R = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_R)/(1._wp + gamma_R))* & (pres_SR/pres_R - 1._wp)*pres_R/ & ((pres_R + pi_inf_R/(1._wp + gamma_R))))) s_L = vel_L(dir_idx(1)) - c_L*Ms_L s_R = vel_R(dir_idx(1)) + c_R*Ms_R - s_S = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & - (pres_L - pres_R)/ & - (rho_avg*c_avg)) + s_S = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & + (pres_L - pres_R)/ & + (rho_avg*c_avg)) end if ! follows Einfeldt et al. @@ -1541,8 +1541,8 @@ contains ! goes with numerical star velocity in x/y/z directions ! xi_P/M = 0.5 +/m sgn(0.5,s_star) - xi_M = (5e-1_wp + sign(0.5_wp, s_S)) - xi_P = (5e-1_wp - sign(0.5_wp, s_S)) + xi_M = (5.e-1_wp + sign(0.5_wp, s_S)) + xi_P = (5.e-1_wp - sign(0.5_wp, s_S)) ! goes with the numerical velocity in x/y/z directions ! xi_P/M (pressure) = min/max(0. sgn(1,sL/sR)) @@ -1777,9 +1777,9 @@ contains qv_R = qv_R + alpha_rho_R(i)*qvs(i) end do - E_L = gamma_L*pres_L + pi_inf_L + 5e-1_wp*rho_L*vel_L_rms + qv_L + E_L = gamma_L*pres_L + pi_inf_L + 5.e-1_wp*rho_L*vel_L_rms + qv_L - E_R = gamma_R*pres_R + pi_inf_R + 5e-1_wp*rho_R*vel_R_rms + qv_R + E_R = gamma_R*pres_R + pi_inf_R + 5.e-1_wp*rho_R*vel_R_rms + qv_R H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R @@ -1809,25 +1809,25 @@ contains /(rho_L*(s_L - vel_L(dir_idx(1))) - & rho_R*(s_R - vel_R(dir_idx(1)))) elseif (wave_speeds == 2) then - pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & - (vel_L(dir_idx(1)) - & - vel_R(dir_idx(1)))) + pres_SL = 5.e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & + (vel_L(dir_idx(1)) - & + vel_R(dir_idx(1)))) pres_SR = pres_SL - Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* & + Ms_L = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_L)/(1._wp + gamma_L))* & (pres_SL/pres_L - 1._wp)*pres_L/ & ((pres_L + pi_inf_L/(1._wp + gamma_L))))) - Ms_R = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_R)/(1._wp + gamma_R))* & + Ms_R = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_R)/(1._wp + gamma_R))* & (pres_SR/pres_R - 1._wp)*pres_R/ & ((pres_R + pi_inf_R/(1._wp + gamma_R))))) s_L = vel_L(dir_idx(1)) - c_L*Ms_L s_R = vel_R(dir_idx(1)) + c_R*Ms_R - s_S = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & - (pres_L - pres_R)/ & - (rho_avg*c_avg)) + s_S = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & + (pres_L - pres_R)/ & + (rho_avg*c_avg)) end if ! follows Einfeldt et al. @@ -1841,8 +1841,8 @@ contains ! goes with numerical velocity in x/y/z directions ! xi_P/M = 0.5 +/m sgn(0.5,s_star) - xi_M = (5e-1_wp + sign(5e-1_wp, s_S)) - xi_P = (5e-1_wp - sign(5e-1_wp, s_S)) + xi_M = (5.e-1_wp + sign(5.e-1_wp, s_S)) + xi_P = (5.e-1_wp - sign(5.e-1_wp, s_S)) !$acc loop seq do i = 1, contxe @@ -2087,9 +2087,9 @@ contains end if end if - E_L = gamma_L*pres_L + pi_inf_L + 5e-1_wp*rho_L*vel_L_rms + E_L = gamma_L*pres_L + pi_inf_L + 5.e-1_wp*rho_L*vel_L_rms - E_R = gamma_R*pres_R + pi_inf_R + 5e-1_wp*rho_R*vel_R_rms + E_R = gamma_R*pres_R + pi_inf_R + 5.e-1_wp*rho_R*vel_R_rms H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R @@ -2192,14 +2192,14 @@ contains if ((.not. f_approx_equal(ptilde_L, ptilde_L)) .or. (.not. f_approx_equal(ptilde_R, ptilde_R))) then end if - rho_avg = 5e-1_wp*(rho_L + rho_R) - H_avg = 5e-1_wp*(H_L + H_R) - gamma_avg = 5e-1_wp*(gamma_L + gamma_R) + rho_avg = 5.e-1_wp*(rho_L + rho_R) + H_avg = 5.e-1_wp*(H_L + H_R) + gamma_avg = 5.e-1_wp*(gamma_L + gamma_R) vel_avg_rms = 0._wp !$acc loop seq do i = 1, num_dims - vel_avg_rms = vel_avg_rms + (5e-1_wp*(vel_L(i) + vel_R(i)))**2._wp + vel_avg_rms = vel_avg_rms + (5.e-1_wp*(vel_L(i) + vel_R(i)))**2._wp end do end if @@ -2238,25 +2238,25 @@ contains /(rho_L*(s_L - vel_L(dir_idx(1))) - & rho_R*(s_R - vel_R(dir_idx(1)))) elseif (wave_speeds == 2) then - pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & - (vel_L(dir_idx(1)) - & - vel_R(dir_idx(1)))) + pres_SL = 5.e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & + (vel_L(dir_idx(1)) - & + vel_R(dir_idx(1)))) pres_SR = pres_SL - Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* & + Ms_L = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_L)/(1._wp + gamma_L))* & (pres_SL/pres_L - 1._wp)*pres_L/ & ((pres_L + pi_inf_L/(1._wp + gamma_L))))) - Ms_R = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_R)/(1._wp + gamma_R))* & + Ms_R = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_R)/(1._wp + gamma_R))* & (pres_SR/pres_R - 1._wp)*pres_R/ & ((pres_R + pi_inf_R/(1._wp + gamma_R))))) s_L = vel_L(dir_idx(1)) - c_L*Ms_L s_R = vel_R(dir_idx(1)) + c_R*Ms_R - s_S = 5e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & - (pres_L - pres_R)/ & - (rho_avg*c_avg)) + s_S = 5.e-1_wp*((vel_L(dir_idx(1)) + vel_R(dir_idx(1))) + & + (pres_L - pres_R)/ & + (rho_avg*c_avg)) end if ! follows Einfeldt et al. @@ -2270,8 +2270,8 @@ contains ! goes with numerical velocity in x/y/z directions ! xi_P/M = 0.5 +/m sgn(0.5,s_star) - xi_M = (5e-1_wp + sign(5e-1_wp, s_S)) - xi_P = (5e-1_wp - sign(5e-1_wp, s_S)) + xi_M = (5.e-1_wp + sign(5.e-1_wp, s_S)) + xi_P = (5.e-1_wp - sign(5.e-1_wp, s_S)) ! Low Mach correction if (low_Mach == 1) then @@ -2599,14 +2599,14 @@ contains call get_mixture_energy_mass(T_L, Ys_L, E_L) call get_mixture_energy_mass(T_R, Ys_R, E_R) - E_L = rho_L*E_L + 5e-1*rho_L*vel_L_rms - E_R = rho_R*E_R + 5e-1*rho_R*vel_R_rms + E_L = rho_L*E_L + 5.e-1*rho_L*vel_L_rms + E_R = rho_R*E_R + 5.e-1*rho_R*vel_R_rms H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R else - E_L = gamma_L*pres_L + pi_inf_L + 5e-1*rho_L*vel_L_rms + qv_L + E_L = gamma_L*pres_L + pi_inf_L + 5.e-1*rho_L*vel_L_rms + qv_L - E_R = gamma_R*pres_R + pi_inf_R + 5e-1*rho_R*vel_R_rms + qv_R + E_R = gamma_R*pres_R + pi_inf_R + 5.e-1*rho_R*vel_R_rms + qv_R H_L = (E_L + pres_L)/rho_L H_R = (E_R + pres_R)/rho_R @@ -2699,11 +2699,11 @@ contains if (wave_speeds == 1) then if (elasticity) then s_L = min(vel_L(dir_idx(1)) - sqrt(c_L*c_L + & - (((4._wp*G_L)/3_wp) + tau_e_L(dir_idx_tau(1)))/rho_L), vel_R(dir_idx(1)) - sqrt(c_R*c_R + & - (((4._wp*G_R)/3_wp) + tau_e_R(dir_idx_tau(1)))/rho_R)) + (((4._wp*G_L)/3._wp) + tau_e_L(dir_idx_tau(1)))/rho_L), vel_R(dir_idx(1)) - sqrt(c_R*c_R + & + (((4._wp*G_R)/3._wp) + tau_e_R(dir_idx_tau(1)))/rho_R)) s_R = max(vel_R(dir_idx(1)) + sqrt(c_R*c_R + & - (((4._wp*G_R)/3_wp) + tau_e_R(dir_idx_tau(1)))/rho_R), vel_L(dir_idx(1)) + sqrt(c_L*c_L + & - (((4._wp*G_L)/3_wp) + tau_e_L(dir_idx_tau(1)))/rho_L)) + (((4._wp*G_R)/3._wp) + tau_e_R(dir_idx_tau(1)))/rho_R), vel_L(dir_idx(1)) + sqrt(c_L*c_L + & + (((4._wp*G_L)/3._wp) + tau_e_L(dir_idx_tau(1)))/rho_L)) s_S = (pres_R - tau_e_R(dir_idx_tau(1)) - pres_L + & tau_e_L(dir_idx_tau(1)) + rho_L*vel_L(idx1)*(s_L - vel_L(idx1)) - & rho_R*vel_R(idx1)*(s_R - vel_R(idx1)))/(rho_L*(s_L - vel_L(idx1)) - & @@ -2717,25 +2717,25 @@ contains end if elseif (wave_speeds == 2) then - pres_SL = 5e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & - (vel_L(idx1) - & - vel_R(idx1))) + pres_SL = 5.e-1_wp*(pres_L + pres_R + rho_avg*c_avg* & + (vel_L(idx1) - & + vel_R(idx1))) pres_SR = pres_SL - Ms_L = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_L)/(1._wp + gamma_L))* & + Ms_L = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_L)/(1._wp + gamma_L))* & (pres_SL/pres_L - 1._wp)*pres_L/ & ((pres_L + pi_inf_L/(1._wp + gamma_L))))) - Ms_R = max(1._wp, sqrt(1._wp + ((5e-1_wp + gamma_R)/(1._wp + gamma_R))* & + Ms_R = max(1._wp, sqrt(1._wp + ((5.e-1_wp + gamma_R)/(1._wp + gamma_R))* & (pres_SR/pres_R - 1._wp)*pres_R/ & ((pres_R + pi_inf_R/(1._wp + gamma_R))))) s_L = vel_L(idx1) - c_L*Ms_L s_R = vel_R(idx1) + c_R*Ms_R - s_S = 5e-1_wp*((vel_L(idx1) + vel_R(idx1)) + & - (pres_L - pres_R)/ & - (rho_avg*c_avg)) + s_S = 5.e-1_wp*((vel_L(idx1) + vel_R(idx1)) + & + (pres_L - pres_R)/ & + (rho_avg*c_avg)) end if ! follows Einfeldt et al. @@ -2749,8 +2749,8 @@ contains ! goes with numerical velocity in x/y/z directions ! xi_P/M = 0.5 +/m sgn(0.5,s_star) - xi_M = (5e-1_wp + sign(5e-1_wp, s_S)) - xi_P = (5e-1_wp - sign(5e-1_wp, s_S)) + xi_M = (5.e-1_wp + sign(5.e-1_wp, s_S)) + xi_P = (5.e-1_wp - sign(5.e-1_wp, s_S)) ! Low Mach correction if (low_Mach == 1) then diff --git a/src/simulation/m_sim_helpers.f90 b/src/simulation/m_sim_helpers.f90 index 5f80d9c0a2..e08e7d8628 100644 --- a/src/simulation/m_sim_helpers.f90 +++ b/src/simulation/m_sim_helpers.f90 @@ -75,7 +75,7 @@ pure subroutine s_compute_enthalpy(q_prim_vf, pres, rho, gamma, pi_inf, Re, H, a pres = q_prim_vf(E_idx)%sf(j, k, l) - E = gamma*pres + pi_inf + 5e-1_wp*rho*vel_sum + qv + E = gamma*pres + pi_inf + 5.e-1_wp*rho*vel_sum + qv ! ENERGY ADJUSTMENTS FOR HYPERELASTIC ENERGY if (hyperelasticity) then diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp index 22665f71c8..02b7345530 100644 --- a/src/simulation/m_start_up.fpp +++ b/src/simulation/m_start_up.fpp @@ -991,7 +991,7 @@ contains dyn_pres = 0._wp do i = mom_idx%beg, mom_idx%end - dyn_pres = dyn_pres + 5e-1_wp*v_vf(i)%sf(j, k, l)*v_vf(i)%sf(j, k, l) & + dyn_pres = dyn_pres + 5.e-1_wp*v_vf(i)%sf(j, k, l)*v_vf(i)%sf(j, k, l) & /max(rho, sgm_eps) end do @@ -1038,7 +1038,7 @@ contains if (t_step == 0) dt_init = dt - if (dt < 1e-3_wp*dt_init .and. cfl_adap_dt .and. proc_rank == 0) then + if (dt < 1.e-3_wp*dt_init .and. cfl_adap_dt .and. proc_rank == 0) then print*, "Delta t = ", dt call s_mpi_abort("Delta t has become too small") end if diff --git a/src/simulation/m_viscous.fpp b/src/simulation/m_viscous.fpp index 34cdc451fd..24b7dbb8df 100644 --- a/src/simulation/m_viscous.fpp +++ b/src/simulation/m_viscous.fpp @@ -663,7 +663,7 @@ contains dqL_prim_dx_n(1)%vf(i)%sf(k, j - 1, l) + & dqR_prim_dx_n(1)%vf(i)%sf(k, j - 1, l)) - dqL_prim_dx_n(2)%vf(i)%sf(k, j, l) = 25e-2_wp* & + dqL_prim_dx_n(2)%vf(i)%sf(k, j, l) = 25.e-2_wp* & dqL_prim_dx_n(2)%vf(i)%sf(k, j, l) end do end do @@ -682,7 +682,7 @@ contains dqL_prim_dx_n(1)%vf(i)%sf(k, j, l) + & dqR_prim_dx_n(1)%vf(i)%sf(k, j, l)) - dqR_prim_dx_n(2)%vf(i)%sf(k, j, l) = 25e-2_wp* & + dqR_prim_dx_n(2)%vf(i)%sf(k, j, l) = 25.e-2_wp* & dqR_prim_dx_n(2)%vf(i)%sf(k, j, l) end do @@ -702,7 +702,7 @@ contains dqL_prim_dy_n(2)%vf(i)%sf(j - 1, k, l) + & dqR_prim_dy_n(2)%vf(i)%sf(j - 1, k, l)) - dqL_prim_dy_n(1)%vf(i)%sf(j, k, l) = 25e-2_wp* & + dqL_prim_dy_n(1)%vf(i)%sf(j, k, l) = 25.e-2_wp* & dqL_prim_dy_n(1)%vf(i)%sf(j, k, l) end do @@ -722,7 +722,7 @@ contains dqL_prim_dy_n(2)%vf(i)%sf(j, k, l) + & dqR_prim_dy_n(2)%vf(i)%sf(j, k, l)) - dqR_prim_dy_n(1)%vf(i)%sf(j, k, l) = 25e-2_wp* & + dqR_prim_dy_n(1)%vf(i)%sf(j, k, l) = 25.e-2_wp* & dqR_prim_dy_n(1)%vf(i)%sf(j, k, l) end do @@ -777,7 +777,7 @@ contains dqL_prim_dz_n(3)%vf(i)%sf(j - 1, k, l) + & dqR_prim_dz_n(3)%vf(i)%sf(j - 1, k, l)) - dqL_prim_dz_n(1)%vf(i)%sf(j, k, l) = 25e-2_wp* & + dqL_prim_dz_n(1)%vf(i)%sf(j, k, l) = 25.e-2_wp* & dqL_prim_dz_n(1)%vf(i)%sf(j, k, l) end do @@ -798,7 +798,7 @@ contains dqL_prim_dz_n(3)%vf(i)%sf(j, k, l) + & dqR_prim_dz_n(3)%vf(i)%sf(j, k, l)) - dqR_prim_dz_n(1)%vf(i)%sf(j, k, l) = 25e-2_wp* & + dqR_prim_dz_n(1)%vf(i)%sf(j, k, l) = 25.e-2_wp* & dqR_prim_dz_n(1)%vf(i)%sf(j, k, l) end do @@ -819,7 +819,7 @@ contains dqL_prim_dz_n(3)%vf(i)%sf(k, j - 1, l) + & dqR_prim_dz_n(3)%vf(i)%sf(k, j - 1, l)) - dqL_prim_dz_n(2)%vf(i)%sf(k, j, l) = 25e-2_wp* & + dqL_prim_dz_n(2)%vf(i)%sf(k, j, l) = 25.e-2_wp* & dqL_prim_dz_n(2)%vf(i)%sf(k, j, l) end do @@ -840,7 +840,7 @@ contains dqL_prim_dz_n(3)%vf(i)%sf(k, j, l) + & dqR_prim_dz_n(3)%vf(i)%sf(k, j, l)) - dqR_prim_dz_n(2)%vf(i)%sf(k, j, l) = 25e-2_wp* & + dqR_prim_dz_n(2)%vf(i)%sf(k, j, l) = 25.e-2_wp* & dqR_prim_dz_n(2)%vf(i)%sf(k, j, l) end do @@ -861,7 +861,7 @@ contains dqL_prim_dy_n(2)%vf(i)%sf(k, l, j - 1) + & dqR_prim_dy_n(2)%vf(i)%sf(k, l, j - 1)) - dqL_prim_dy_n(3)%vf(i)%sf(k, l, j) = 25e-2_wp* & + dqL_prim_dy_n(3)%vf(i)%sf(k, l, j) = 25.e-2_wp* & dqL_prim_dy_n(3)%vf(i)%sf(k, l, j) end do @@ -882,7 +882,7 @@ contains dqL_prim_dy_n(2)%vf(i)%sf(k, l, j) + & dqR_prim_dy_n(2)%vf(i)%sf(k, l, j)) - dqR_prim_dy_n(3)%vf(i)%sf(k, l, j) = 25e-2_wp* & + dqR_prim_dy_n(3)%vf(i)%sf(k, l, j) = 25.e-2_wp* & dqR_prim_dy_n(3)%vf(i)%sf(k, l, j) end do @@ -902,7 +902,7 @@ contains dqL_prim_dx_n(1)%vf(i)%sf(k, l, j - 1) + & dqR_prim_dx_n(1)%vf(i)%sf(k, l, j - 1)) - dqL_prim_dx_n(3)%vf(i)%sf(k, l, j) = 25e-2_wp* & + dqL_prim_dx_n(3)%vf(i)%sf(k, l, j) = 25.e-2_wp* & dqL_prim_dx_n(3)%vf(i)%sf(k, l, j) end do @@ -921,7 +921,7 @@ contains dqL_prim_dx_n(1)%vf(i)%sf(k, l, j) + & dqR_prim_dx_n(1)%vf(i)%sf(k, l, j)) - dqR_prim_dx_n(3)%vf(i)%sf(k, l, j) = 25e-2_wp* & + dqR_prim_dx_n(3)%vf(i)%sf(k, l, j) = 25.e-2_wp* & dqR_prim_dx_n(3)%vf(i)%sf(k, l, j) end do diff --git a/src/simulation/m_weno.fpp b/src/simulation/m_weno.fpp index b4dc5ad0c9..fb13b45aba 100644 --- a/src/simulation/m_weno.fpp +++ b/src/simulation/m_weno.fpp @@ -1300,11 +1300,11 @@ contains vL_MD = (v_rs_ws(j, k, l, i) & + v_rs_ws(j - 1, k, l, i) & - - d_MD)*5e-1_wp + - d_MD)*5.e-1_wp vL_LC = v_rs_ws(j, k, l, i) & - (v_rs_ws(j + 1, k, l, i) & - - v_rs_ws(j, k, l, i))*5e-1_wp + beta_mp*d_LC + - v_rs_ws(j, k, l, i))*5.e-1_wp + beta_mp*d_LC vL_min = max(min(v_rs_ws(j, k, l, i), & v_rs_ws(j - 1, k, l, i), & @@ -1321,8 +1321,8 @@ contains vL_LC)) vL_rs_vf(j, k, l, i) = vL_rs_vf(j, k, l, i) & - + (sign(5e-1_wp, vL_min - vL_rs_vf(j, k, l, i)) & - + sign(5e-1_wp, vL_max - vL_rs_vf(j, k, l, i))) & + + (sign(5.e-1_wp, vL_min - vL_rs_vf(j, k, l, i)) & + + sign(5.e-1_wp, vL_max - vL_rs_vf(j, k, l, i))) & *min(abs(vL_min - vL_rs_vf(j, k, l, i)), & abs(vL_max - vL_rs_vf(j, k, l, i))) ! END: Left Monotonicity Preserving Bound @@ -1359,11 +1359,11 @@ contains vR_MD = (v_rs_ws(j, k, l, i) & + v_rs_ws(j + 1, k, l, i) & - - d_MD)*5e-1_wp + - d_MD)*5.e-1_wp vR_LC = v_rs_ws(j, k, l, i) & + (v_rs_ws(j, k, l, i) & - - v_rs_ws(j - 1, k, l, i))*5e-1_wp + beta_mp*d_LC + - v_rs_ws(j - 1, k, l, i))*5.e-1_wp + beta_mp*d_LC vR_min = max(min(v_rs_ws(j, k, l, i), & v_rs_ws(j + 1, k, l, i), & @@ -1380,8 +1380,8 @@ contains vR_LC)) vR_rs_vf(j, k, l, i) = vR_rs_vf(j, k, l, i) & - + (sign(5e-1_wp, vR_min - vR_rs_vf(j, k, l, i)) & - + sign(5e-1_wp, vR_max - vR_rs_vf(j, k, l, i))) & + + (sign(5.e-1_wp, vR_min - vR_rs_vf(j, k, l, i)) & + + sign(5.e-1_wp, vR_max - vR_rs_vf(j, k, l, i))) & *min(abs(vR_min - vR_rs_vf(j, k, l, i)), & abs(vR_max - vR_rs_vf(j, k, l, i))) ! END: Right Monotonicity Preserving Bound