diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-23 16:18:47 -0600 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-23 16:18:47 -0600 |
| commit | 21a06b511674e1b75e05b83981fb7ad71d083ae2 (patch) | |
| tree | 0db716c9a8608c1f19904e5849c199471db7fa71 /ML_WaveToy | |
| parent | c1d31e46320eaef103a48dcfa1095f5355031bf3 (diff) | |
Regenerate code (CCTK_LOOP)
Kranc commit 121ff02440893cfabee9899a90048b393dadaa7c
Diffstat (limited to 'ML_WaveToy')
| -rw-r--r-- | ML_WaveToy/configuration.ccl | 4 | ||||
| -rw-r--r-- | ML_WaveToy/src/WT_Gaussian.cc | 5 | ||||
| -rw-r--r-- | ML_WaveToy/src/WT_RHS.cc | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ML_WaveToy/configuration.ccl b/ML_WaveToy/configuration.ccl index 8e2c3c5..0a66ec2 100644 --- a/ML_WaveToy/configuration.ccl +++ b/ML_WaveToy/configuration.ccl @@ -1,4 +1,6 @@ # File produced by Kranc REQUIRES GenericFD -REQUIRES LoopControl +OPTIONAL LoopControl +{ +} diff --git a/ML_WaveToy/src/WT_Gaussian.cc b/ML_WaveToy/src/WT_Gaussian.cc index e6faf2f..bd7116c 100644 --- a/ML_WaveToy/src/WT_Gaussian.cc +++ b/ML_WaveToy/src/WT_Gaussian.cc @@ -12,6 +12,7 @@ #include "cctk_Parameters.h" #include "GenericFD.h" #include "Differencing.h" +#include "cctk_Loop.h" #include "loopcontrol.h" /* Define macros used in calculations */ @@ -76,7 +77,7 @@ static void WT_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, i /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3 (WT_Gaussian, + CCTK_LOOP3 (WT_Gaussian, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -99,7 +100,7 @@ static void WT_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, i rho[index] = rhoL; u[index] = uL; } - LC_ENDLOOP3 (WT_Gaussian); + CCTK_ENDLOOP3 (WT_Gaussian); } extern "C" void WT_Gaussian(CCTK_ARGUMENTS) diff --git a/ML_WaveToy/src/WT_RHS.cc b/ML_WaveToy/src/WT_RHS.cc index 01cb50e..6fe1d8e 100644 --- a/ML_WaveToy/src/WT_RHS.cc +++ b/ML_WaveToy/src/WT_RHS.cc @@ -12,6 +12,7 @@ #include "cctk_Parameters.h" #include "GenericFD.h" #include "Differencing.h" +#include "cctk_Loop.h" #include "loopcontrol.h" /* Define macros used in calculations */ @@ -91,7 +92,7 @@ static void WT_RHS_Body(cGH const * restrict const cctkGH, int const dir, int co /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3 (WT_RHS, + CCTK_LOOP3 (WT_RHS, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -120,7 +121,7 @@ static void WT_RHS_Body(cGH const * restrict const cctkGH, int const dir, int co rhorhs[index] = rhorhsL; urhs[index] = urhsL; } - LC_ENDLOOP3 (WT_RHS); + CCTK_ENDLOOP3 (WT_RHS); } extern "C" void WT_RHS(CCTK_ARGUMENTS) |