diff --git a/.github/workflows/docker_actions.yml b/.github/workflows/docker_actions.yml index 1bb226d963..028e5f1546 100644 --- a/.github/workflows/docker_actions.yml +++ b/.github/workflows/docker_actions.yml @@ -28,7 +28,7 @@ jobs: fetch-depth: 5 - name: Setup cache id: setup-cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: | ~/cache diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index 70315c55b0..fe887ee951 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -475,7 +475,7 @@ jobs: shell: bash - name: Setup cache id: setup-cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: | ~/cache diff --git a/src/nwpw/pspw/lib/coulomb/coulomb.F b/src/nwpw/pspw/lib/coulomb/coulomb.F index f5d4225af0..5816f002f7 100644 --- a/src/nwpw/pspw/lib/coulomb/coulomb.F +++ b/src/nwpw/pspw/lib/coulomb/coulomb.F @@ -68,8 +68,9 @@ c > + i+1 > + dbl_mb(G(2)+i-1)*dbl_mb(G(2)+i-1) > + dbl_mb(G(3)+i-1)*dbl_mb(G(3)+i-1) ) - if (((pzero.eq.taskid) .and. (i.eq.zero)).or. - E (abs(gg) .lt.toll)) then + if ((abs(gg) .lt.toll)) then + dbl_mb(tmp1(1)+i-1) = 0.0d0 + elseif (((pzero.eq.taskid) .and. (i.eq.zero))) then dbl_mb(tmp1(1)+i-1) = 0.0d0 else dbl_mb(tmp1(1)+i-1) = fourpi/gg