diff options
| author | schnetter <schnetter@850bcc8b-0e4f-0410-8c26-8d28fbf1eda9> | 2007-12-05 23:14:14 +0000 |
|---|---|---|
| committer | schnetter <schnetter@850bcc8b-0e4f-0410-8c26-8d28fbf1eda9> | 2007-12-05 23:14:14 +0000 |
| commit | 4dddaca99da04a904ca4573b465eaf756c619fc6 (patch) | |
| tree | 0a35315b0311cb8c6dd32381fc50a7ecf0ceff2f /src | |
| parent | 4de562c4595ff46790e4a6b7179a0fadb8aa3515 (diff) | |
Add new parameter use_dissipation_near_excision.
Add OpenMP parallelisation.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Dissipation/trunk@30 850bcc8b-0e4f-0410-8c26-8d28fbf1eda9
Diffstat (limited to 'src')
| -rw-r--r-- | src/apply_dissipation.F77 | 8 | ||||
| -rw-r--r-- | src/dissipation.c | 6 | ||||
| -rw-r--r-- | src/setup_epsdis.c | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/apply_dissipation.F77 b/src/apply_dissipation.F77 index d67a02e..b4e3545 100644 --- a/src/apply_dissipation.F77 +++ b/src/apply_dissipation.F77 @@ -2,12 +2,12 @@ c $Header$ #include "cctk.h" - subroutine apply_dissipation (var, rhs, ni, nj, nk, dx, dt, order, epsdis) + subroutine apply_dissipation (var, rhs, ni, nj, nk, dx, order, epsdis) implicit none integer ni, nj, nk CCTK_REAL var(ni,nj,nk), rhs(ni,nj,nk) - CCTK_REAL dx(3), dt + CCTK_REAL dx(3) CCTK_INT order CCTK_REAL epsdis(ni,nj,nk) @@ -15,6 +15,7 @@ c $Header$ if (order .eq. 1) then +c$omp parallel do do k = 2, nk-1 do j = 2, nj-1 do i = 2, ni-1 @@ -29,6 +30,7 @@ c $Header$ else if (order .eq. 3) then +c$omp parallel do do k = 3, nk-2 do j = 3, nj-2 do i = 3, ni-2 @@ -44,6 +46,7 @@ c $Header$ else if (order .eq. 5) then +c$omp parallel do do k = 4, nk-3 do j = 4, nj-3 do i = 4, ni-3 @@ -59,6 +62,7 @@ c $Header$ else if (order .eq. 7) then +c$omp parallel do do k = 5, nk-4 do j = 5, nj-4 do i = 5, ni-4 diff --git a/src/dissipation.c b/src/dissipation.c index e04c8d5..42ed6b9 100644 --- a/src/dissipation.c +++ b/src/dissipation.c @@ -15,7 +15,6 @@ CCTK_FNAME(apply_dissipation) (CCTK_REAL const * const var, int const * const nj, int const * const nk, CCTK_REAL const * const dx, - CCTK_REAL const * const dt, CCTK_INT const * const order, CCTK_REAL const * const epsdis); @@ -42,7 +41,7 @@ apply (int const varindex, char const * const optstring, void * const arg) cGroup vardata, rhsdata; CCTK_REAL const * varptr; CCTK_REAL * rhsptr; - CCTK_REAL dt, dx[3]; + CCTK_REAL dx[3]; int n; int d; int ierr; @@ -58,7 +57,6 @@ apply (int const varindex, char const * const optstring, void * const arg) } } - dt = CCTK_DELTA_TIME; for (d=0; d<3; ++d) { dx[d] = CCTK_DELTA_SPACE(d); } @@ -110,5 +108,5 @@ apply (int const varindex, char const * const optstring, void * const arg) CCTK_FNAME(apply_dissipation) (varptr, rhsptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - dx, &dt, &order, epsdisA); + dx, &order, epsdisA); } diff --git a/src/setup_epsdis.c b/src/setup_epsdis.c index b3a3b9c..a3db48b 100644 --- a/src/setup_epsdis.c +++ b/src/setup_epsdis.c @@ -168,8 +168,8 @@ setup_epsdis (CCTK_ARGUMENTS) if (verbose) { CCTK_VInfo(CCTK_THORNSTRING, "Invalid Surface: s=%d, sf_va=%d, surf_no=%d, ah_no=%d", - s,sf_valid[surface_number[s]], - surface_number[s],horizon_number[s]); + s,(int)sf_valid[surface_number[s]], + (int)surface_number[s],(int)horizon_number[s]); } continue; } |