diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2013-02-07 09:57:48 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2013-02-08 08:58:22 -0500 |
| commit | 17a700cdb8d4ee0fa187e455cac7cb37389b95d5 (patch) | |
| tree | f3d21f6360769e0ac79cadfb4b1187b97fa6eca3 /Carpet/LoopControl/src/loopcontrol_fortran.h | |
| parent | 40ce23776a26f11650b5562080789de04f0c5685 (diff) | |
LoopControl: Remove trivial vector lengths for j and k direction
Diffstat (limited to 'Carpet/LoopControl/src/loopcontrol_fortran.h')
| -rw-r--r-- | Carpet/LoopControl/src/loopcontrol_fortran.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Carpet/LoopControl/src/loopcontrol_fortran.h b/Carpet/LoopControl/src/loopcontrol_fortran.h index 226dbd5dd..aee1f79c5 100644 --- a/Carpet/LoopControl/src/loopcontrol_fortran.h +++ b/Carpet/LoopControl/src/loopcontrol_fortran.h @@ -53,7 +53,7 @@ #define LC_LOOP3STR_NORMAL_DECLARE(name) \ && integer :: name/**/_dir1, name/**/_dir2, name/**/_dir3 \ && integer :: name/**/_ash1, name/**/_ash2, name/**/_ash3 \ - && integer :: name/**/_align1, name/**/_align2, name/**/_align3 \ + && integer :: name/**/_str1 \ && CCTK_POINTER, save :: name/**/_stats = 0 \ && type(lc_control_t) :: name/**/_control \ LC_COARSE_DECLARE(name,1) \ @@ -79,23 +79,21 @@ imin_,jmin_,kmin_, \ imax_,jmax_,kmax_, \ iash_,jash_,kash_, \ - vec_imin,vec_imax, di_) \ + vec_imin,vec_imax, istr_) \ && name/**/_dir1 = (idir_) \ && name/**/_dir2 = (jdir_) \ && name/**/_dir3 = (kdir_) \ && name/**/_ash1 = (iash_) \ && name/**/_ash2 = (jash_) \ && name/**/_ash3 = (kash_) \ - && name/**/_align1 = (di_) \ - && name/**/_align2 = 1 \ - && name/**/_align3 = 1 \ + && name/**/_str1 = (istr_) \ \ && call lc_stats_init(name/**/_stats, __LINE__, __FILE__, "name") \ && call lc_control_init(name/**/_control, name/**/_stats, \ (imin_), (jmin_), (kmin_), \ (imax_), (jmax_), (kmax_), \ name/**/_ash1, name/**/_ash2, name/**/_ash3, \ - name/**/_align1, name/**/_align2, name/**/_align3) \ + name/**/_str1) \ \ /* Multithreading */ \ && call lc_thread_init(name/**/_control) \ |