From cefdd1989d0641e9cf3da455502255ea333cd0cb Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 2 Dec 2010 13:37:24 -0500 Subject: CarpetLib: Remove dependency on LoopControl --- Carpet/CarpetLib/configuration.ccl | 6 +++++- Carpet/CarpetLib/src/interpolate_3d_2tl.cc | 12 ++++++------ Carpet/CarpetLib/src/interpolate_3d_3tl.cc | 12 ++++++------ Carpet/CarpetLib/src/interpolate_3d_4tl.cc | 12 ++++++------ Carpet/CarpetLib/src/interpolate_3d_5tl.cc | 12 ++++++------ Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc | 12 ++++++------ 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/Carpet/CarpetLib/configuration.ccl b/Carpet/CarpetLib/configuration.ccl index 3ad1b93bf..313afc304 100644 --- a/Carpet/CarpetLib/configuration.ccl +++ b/Carpet/CarpetLib/configuration.ccl @@ -6,4 +6,8 @@ PROVIDES CarpetLib LANG } -REQUIRES LoopControl +OPTIONAL LoopControl +{ +} + +REQUIRES Vectors diff --git a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc index 339453f55..3627dee7d 100644 --- a/Carpet/CarpetLib/src/interpolate_3d_2tl.cc +++ b/Carpet/CarpetLib/src/interpolate_3d_2tl.cc @@ -1,11 +1,11 @@ +#include +#include + #include #include #include #include -#include -#include - #include #include "operator_prototypes_3d.hh" @@ -123,15 +123,15 @@ namespace CarpetLib { // Loop over region #pragma omp parallel - LC_LOOP3 (interpolate_3d_2tl, - i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) + CCTK_LOOP3(interpolate_3d_2tl, + i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) { dst [DSTIND3(i, j, k)] = + s1fac * src1 [SRCIND3(i, j, k)] + s2fac * src2 [SRCIND3(i, j, k)]; - } LC_ENDLOOP3 (interpolate_3d_2tl); + } CCTK_ENDLOOP3(interpolate_3d_2tl); } diff --git a/Carpet/CarpetLib/src/interpolate_3d_3tl.cc b/Carpet/CarpetLib/src/interpolate_3d_3tl.cc index 41762727b..28527ce3e 100644 --- a/Carpet/CarpetLib/src/interpolate_3d_3tl.cc +++ b/Carpet/CarpetLib/src/interpolate_3d_3tl.cc @@ -1,11 +1,11 @@ +#include +#include + #include #include #include #include -#include -#include - #include #include "operator_prototypes_3d.hh" @@ -127,8 +127,8 @@ namespace CarpetLib { // Loop over region #pragma omp parallel - LC_LOOP3 (interpolate_3d_3tl, - i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) + CCTK_LOOP3(interpolate_3d_3tl, + i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) { dst [DSTIND3(i, j, k)] = @@ -136,7 +136,7 @@ namespace CarpetLib { + s2fac * src2 [SRCIND3(i, j, k)] + s3fac * src3 [SRCIND3(i, j, k)]; - } LC_ENDLOOP3(interpolate_3d_3tl); + } CCTK_ENDLOOP3(interpolate_3d_3tl); } diff --git a/Carpet/CarpetLib/src/interpolate_3d_4tl.cc b/Carpet/CarpetLib/src/interpolate_3d_4tl.cc index 0ed5cf3d1..c5d44ca82 100644 --- a/Carpet/CarpetLib/src/interpolate_3d_4tl.cc +++ b/Carpet/CarpetLib/src/interpolate_3d_4tl.cc @@ -1,11 +1,11 @@ +#include +#include + #include #include #include #include -#include -#include - #include #include "operator_prototypes_3d.hh" @@ -134,8 +134,8 @@ namespace CarpetLib { // Loop over region #pragma omp parallel - LC_LOOP3 (interpolate_3d_4tl, - i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) + CCTK_LOOP3(interpolate_3d_4tl, + i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) { dst [DSTIND3(i, j, k)] = @@ -144,7 +144,7 @@ namespace CarpetLib { + s3fac * src3 [SRCIND3(i, j, k)] + s4fac * src4 [SRCIND3(i, j, k)]; - } LC_ENDLOOP3(interpolate_3d_5tl); + } CCTK_ENDLOOP3(interpolate_3d_4tl); } diff --git a/Carpet/CarpetLib/src/interpolate_3d_5tl.cc b/Carpet/CarpetLib/src/interpolate_3d_5tl.cc index f053634c8..431351b37 100644 --- a/Carpet/CarpetLib/src/interpolate_3d_5tl.cc +++ b/Carpet/CarpetLib/src/interpolate_3d_5tl.cc @@ -1,11 +1,11 @@ +#include +#include + #include #include #include #include -#include -#include - #include #include "operator_prototypes_3d.hh" @@ -139,8 +139,8 @@ namespace CarpetLib { // Loop over region #pragma omp parallel - LC_LOOP3 (interpolate_3d_5tl, - i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) + CCTK_LOOP3(interpolate_3d_5tl, + i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) { dst [DSTIND3(i, j, k)] = @@ -150,7 +150,7 @@ namespace CarpetLib { + s4fac * src4 [SRCIND3(i, j, k)] + s5fac * src5 [SRCIND3(i, j, k)]; - } LC_ENDLOOP3(interpolate_3d_5tl); + } CCTK_ENDLOOP3(interpolate_3d_5tl); } diff --git a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc index 3c9e5beef..bd5f53129 100644 --- a/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc +++ b/Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc @@ -1,11 +1,11 @@ +#include +#include + #include #include #include #include -#include -#include - #include #include "operator_prototypes_3d.hh" @@ -166,8 +166,8 @@ namespace CarpetLib { // Loop over region #pragma omp parallel - LC_LOOP3 (interpolate_end_3d_3tl, - i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) + CCTK_LOOP3 (interpolate_end_3d_3tl, + i,j,k, 0,0,0, regiext,regjext,regkext, srciext,srcjext,srckext) { T const s1 = src1 [SRCIND3(i, j, k)]; @@ -189,7 +189,7 @@ namespace CarpetLib { dst [DSTIND3(i, j, k)] = d; - } LC_ENDLOOP3(interpolate_end_3d_3tl); + } CCTK_ENDLOOP3(interpolate_end_3d_3tl); } -- cgit v1.2.3