diff options
| author | schnetter <schnetter@f69c4107-0314-4c4f-9ad4-17e986b73f4a> | 2006-08-26 16:42:29 +0000 |
|---|---|---|
| committer | schnetter <schnetter@f69c4107-0314-4c4f-9ad4-17e986b73f4a> | 2006-08-26 16:42:29 +0000 |
| commit | 5ae57c39d83cdabb15b1238a6c142d6f7f8a4456 (patch) | |
| tree | 9b9edf46e7aa24282496fc3a479d0a788358578b | |
| parent | 17710d6ad65e9b0a756d9bb72d0fea74c05c3d8d (diff) | |
Simplify some expressions calculating dissipation coefficients. This
makes it compile with certain versions of gfortran.
Change type of argument "part" to set_dmatrix_half from CCTK_INT to
integer since it is called with integer (not CCTK_INT) values.
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/SummationByParts/trunk@77 f69c4107-0314-4c4f-9ad4-17e986b73f4a
| -rw-r--r-- | src/Dissipation_4_3_min_err_coeff_alt.F90 | 22 | ||||
| -rw-r--r-- | src/Dissipation_6_5_min_err_coeff.F90 | 32 |
2 files changed, 22 insertions, 32 deletions
diff --git a/src/Dissipation_4_3_min_err_coeff_alt.F90 b/src/Dissipation_4_3_min_err_coeff_alt.F90 index c2e34ba..4a4a0d9 100644 --- a/src/Dissipation_4_3_min_err_coeff_alt.F90 +++ b/src/Dissipation_4_3_min_err_coeff_alt.F90 @@ -81,12 +81,10 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & il = center + 1 - max(3,gsize(1)) d = zero call set_dmatrix_half ( d(il:ni,il:ni), 2 ) - tmp(il:ni,il:ni) = -transpose ( & - matmul ( h(il:ni,il:ni), & - matmul ( & - transpose ( d(il:ni,il:ni) ), & - matmul ( b(il:ni,il:ni), & - d(il:ni,il:ni) ) ) ) ) + tmp(il:ni,il:ni) = matmul ( b(il:ni,il:ni), d(il:ni,il:ni) ) + tmp(il:ni,il:ni) = matmul ( transpose ( d(il:ni,il:ni) ), tmp(il:ni,il:ni) ) + tmp(il:ni,il:ni) = matmul ( h(il:ni,il:ni), tmp(il:ni,il:ni) ) + tmp(il:ni,il:ni) = -transpose ( tmp(il:ni,il:ni) ) atmp(il:ni,center+1:ni) = tmp(il:ni,center+1:ni) @@ -395,12 +393,10 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & call set_dmatrix_half ( d(1:kr,1:kr), 1 ) - tmp(1:kr,1:kr) = -transpose ( & - matmul ( h(1:kr,1:kr), & - matmul ( & - transpose ( d(1:kr,1:kr) ), & - matmul ( b(1:kr,1:kr), & - d(1:kr,1:kr) ) ) ) ) + tmp(1:kr,1:kr) = matmul ( b(1:kr,1:kr), d(1:kr,1:kr) ) + tmp(1:kr,1:kr) = matmul ( transpose ( d(1:kr,1:kr) ), tmp(1:kr,1:kr) ) + tmp(1:kr,1:kr) = matmul ( h(1:kr,1:kr), tmp(1:kr,1:kr) ) + tmp(1:kr,1:kr) = -transpose ( tmp(1:kr,1:kr) ) atmp(1:kr,1:center) = tmp(1:kr,1:center) @@ -594,7 +590,7 @@ contains implicit none CCTK_REAL, dimension(:,:), intent(out) :: d - CCTK_INT, intent(in) :: part + integer, intent(in) :: part CCTK_INT :: n CCTK_REAL, dimension(4), save :: ac = (/ -1.0_wp, 3.0_wp, -3.0_wp, 1.0_wp /) CCTK_INT :: i diff --git a/src/Dissipation_6_5_min_err_coeff.F90 b/src/Dissipation_6_5_min_err_coeff.F90 index 623efad..4fe6120 100644 --- a/src/Dissipation_6_5_min_err_coeff.F90 +++ b/src/Dissipation_6_5_min_err_coeff.F90 @@ -69,24 +69,20 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & call set_dmatrix_half ( d(1:ir,1:ir), 1 ) - tmp(1:ir,1:ir) = -transpose ( & - matmul ( h(1:ir,1:ir), & - matmul ( & - transpose ( d(1:ir,1:ir) ), & - matmul ( b(1:ir,1:ir), & - d(1:ir,1:ir) ) ) ) ) + tmp(1:ir,1:ir) = matmul ( b(1:ir,1:ir), d(1:ir,1:ir) ) + tmp(1:ir,1:ir) = matmul ( transpose ( d(1:ir,1:ir) ), tmp(1:ir,1:ir) ) + tmp(1:ir,1:ir) = matmul ( h(1:ir,1:ir), tmp(1:ir,1:ir) ) + tmp(1:ir,1:ir) = -transpose ( tmp(1:ir,1:ir) ) atmp(1:ir,1:center) = tmp(1:ir,1:center) il = center + 1 - max(gsize(1),3) d = zero call set_dmatrix_half ( d(il:ni,il:ni), 2 ) - tmp(il:ni,il:ni) = -transpose ( & - matmul ( h(il:ni,il:ni), & - matmul ( & - transpose ( d(il:ni,il:ni) ), & - matmul ( b(il:ni,il:ni), & - d(il:ni,il:ni) ) ) ) ) + tmp(il:ni,il:ni) = matmul ( b(il:ni,il:ni), d(il:ni,il:ni) ) + tmp(il:ni,il:ni) = matmul ( transpose ( d(il:ni,il:ni) ), tmp(il:ni,il:ni) ) + tmp(il:ni,il:ni) = matmul ( h(il:ni,il:ni), tmp(il:ni,il:ni) ) + tmp(il:ni,il:ni) = -transpose ( tmp(il:ni,il:ni) ) atmp(il:ni,center+1:ni) = tmp(il:ni,center+1:ni) @@ -281,12 +277,10 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & call set_dmatrix_half ( d(1:jr,1:jr), 1 ) - tmp(1:jr,1:jr) = -transpose ( & - matmul ( h(1:jr,1:jr), & - matmul ( & - transpose ( d(1:jr,1:jr) ), & - matmul ( b(1:jr,1:jr), & - d(1:jr,1:jr) ) ) ) ) + tmp(1:jr,1:jr) = matmul ( b(1:jr,1:jr), d(1:jr,1:jr) ) + tmp(1:jr,1:jr) = matmul ( transpose ( d(1:jr,1:jr) ), tmp(1:jr,1:jr) ) + tmp(1:jr,1:jr) = matmul ( h(1:jr,1:jr), tmp(1:jr,1:jr) ) + tmp(1:jr,1:jr) = -transpose ( tmp(1:jr,1:jr) ) atmp(1:jr,1:center) = tmp(1:jr,1:center) @@ -744,7 +738,7 @@ contains implicit none CCTK_REAL, dimension(:,:), intent(out) :: d - CCTK_INT, intent(in) :: part + integer, intent(in) :: part CCTK_INT :: n CCTK_REAL, dimension(4), save :: ac = (/ -1.0_wp, 3.0_wp, -3.0_wp, 1.0_wp /) CCTK_INT :: i |