From 8df3aae833eb6bf334b0decb57ebf9e1baf33ddf Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Tue, 10 Sep 2013 16:03:25 +0200 Subject: Regenerate code (Kranc commit 10daf4a83a783a812c7b5a3aba0df115f0eac98f) --- ML_WaveToy/src/WT_Dirichlet.cc | 23 ++++++++++++++--------- ML_WaveToy/src/WT_Energy.cc | 21 +++++++++++++-------- ML_WaveToy/src/WT_EnergyBoundary.cc | 21 +++++++++++++-------- ML_WaveToy/src/WT_Gaussian.cc | 23 ++++++++++++++--------- ML_WaveToy/src/WT_RHS.cc | 23 ++++++++++++++--------- ML_WaveToy/src/WT_Standing.cc | 27 ++++++++++++++++----------- 6 files changed, 84 insertions(+), 54 deletions(-) (limited to 'ML_WaveToy') diff --git a/ML_WaveToy/src/WT_Dirichlet.cc b/ML_WaveToy/src/WT_Dirichlet.cc index 90db8c0..f38419f 100644 --- a/ML_WaveToy/src/WT_Dirichlet.cc +++ b/ML_WaveToy/src/WT_Dirichlet.cc @@ -68,13 +68,18 @@ static void WT_Dirichlet_Body(const cGH* restrict const cctkGH, const int dir, c const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -120,9 +125,9 @@ static void WT_Dirichlet_Body(const cGH* restrict const cctkGH, const int dir, c /* Precompute derivatives */ /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED urhsL = ToReal(0); + CCTK_REAL_VEC urhsL CCTK_ATTRIBUTE_UNUSED = ToReal(0); - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhorhsL = ToReal(0); + CCTK_REAL_VEC rhorhsL CCTK_ATTRIBUTE_UNUSED = ToReal(0); /* Copy local copies back to grid functions */ vec_store_partial_prepare(i,vecimin,vecimax); diff --git a/ML_WaveToy/src/WT_Energy.cc b/ML_WaveToy/src/WT_Energy.cc index 3c876ff..905d52f 100644 --- a/ML_WaveToy/src/WT_Energy.cc +++ b/ML_WaveToy/src/WT_Energy.cc @@ -65,13 +65,18 @@ static void WT_Energy_Body(const cGH* restrict const cctkGH, const int dir, cons const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -122,7 +127,7 @@ static void WT_Energy_Body(const cGH* restrict const cctkGH, const int dir, cons const CCTK_REAL_VEC PDstandardNth3u CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&u[index]); /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED epsL = + CCTK_REAL_VEC epsL CCTK_ATTRIBUTE_UNUSED = kmul(kmadd(rhoL,rhoL,kmadd(PDstandardNth1u,PDstandardNth1u,kmadd(PDstandardNth2u,PDstandardNth2u,kmul(PDstandardNth3u,PDstandardNth3u)))),ToReal(0.5)); /* Copy local copies back to grid functions */ diff --git a/ML_WaveToy/src/WT_EnergyBoundary.cc b/ML_WaveToy/src/WT_EnergyBoundary.cc index d1153dd..c662ed2 100644 --- a/ML_WaveToy/src/WT_EnergyBoundary.cc +++ b/ML_WaveToy/src/WT_EnergyBoundary.cc @@ -65,13 +65,18 @@ static void WT_EnergyBoundary_Body(const cGH* restrict const cctkGH, const int d const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -117,7 +122,7 @@ static void WT_EnergyBoundary_Body(const cGH* restrict const cctkGH, const int d /* Precompute derivatives */ /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED epsL = ToReal(0); + CCTK_REAL_VEC epsL CCTK_ATTRIBUTE_UNUSED = ToReal(0); /* Copy local copies back to grid functions */ vec_store_partial_prepare(i,vecimin,vecimax); diff --git a/ML_WaveToy/src/WT_Gaussian.cc b/ML_WaveToy/src/WT_Gaussian.cc index d1a38cf..1991abf 100644 --- a/ML_WaveToy/src/WT_Gaussian.cc +++ b/ML_WaveToy/src/WT_Gaussian.cc @@ -51,13 +51,18 @@ static void WT_Gaussian_Body(const cGH* restrict const cctkGH, const int dir, co const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -104,10 +109,10 @@ static void WT_Gaussian_Body(const cGH* restrict const cctkGH, const int dir, co /* Precompute derivatives */ /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED uL = + CCTK_REAL_VEC uL CCTK_ATTRIBUTE_UNUSED = kmul(kexp(kmul(kmul(kmul(rL,rL),ToReal(-0.5)),ToReal(ScalarINV(ScalarSQR(width))))),ToReal(amplitude)); - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhoL = ToReal(0); + CCTK_REAL_VEC rhoL CCTK_ATTRIBUTE_UNUSED = ToReal(0); /* Copy local copies back to grid functions */ vec_store_partial_prepare(i,vecimin,vecimax); diff --git a/ML_WaveToy/src/WT_RHS.cc b/ML_WaveToy/src/WT_RHS.cc index 7fb1ac8..b7b8749 100644 --- a/ML_WaveToy/src/WT_RHS.cc +++ b/ML_WaveToy/src/WT_RHS.cc @@ -68,13 +68,18 @@ static void WT_RHS_Body(const cGH* restrict const cctkGH, const int dir, const i const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -125,9 +130,9 @@ static void WT_RHS_Body(const cGH* restrict const cctkGH, const int dir, const i const CCTK_REAL_VEC PDstandardNth33u CCTK_ATTRIBUTE_UNUSED = PDstandardNth33(&u[index]); /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED urhsL = rhoL; + CCTK_REAL_VEC urhsL CCTK_ATTRIBUTE_UNUSED = rhoL; - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhorhsL = + CCTK_REAL_VEC rhorhsL CCTK_ATTRIBUTE_UNUSED = kadd(PDstandardNth11u,kadd(PDstandardNth22u,PDstandardNth33u)); /* Copy local copies back to grid functions */ diff --git a/ML_WaveToy/src/WT_Standing.cc b/ML_WaveToy/src/WT_Standing.cc index 68edf00..1ae5f5a 100644 --- a/ML_WaveToy/src/WT_Standing.cc +++ b/ML_WaveToy/src/WT_Standing.cc @@ -51,13 +51,18 @@ static void WT_Standing_Body(const cGH* restrict const cctkGH, const int dir, co const CCTK_REAL_VEC dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); const CCTK_REAL_VEC dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); const CCTK_REAL_VEC khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - const CCTK_REAL_VEC keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + const CCTK_REAL_VEC kthird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.333333333333333333333333333333); + const CCTK_REAL_VEC ktwothird CCTK_ATTRIBUTE_UNUSED = + ToReal(0.666666666666666666666666666667); + const CCTK_REAL_VEC kfourthird CCTK_ATTRIBUTE_UNUSED = + ToReal(1.33333333333333333333333333333); + const CCTK_REAL_VEC hdxi CCTK_ATTRIBUTE_UNUSED = + kmul(dxi,ToReal(0.5)); + const CCTK_REAL_VEC hdyi CCTK_ATTRIBUTE_UNUSED = + kmul(dyi,ToReal(0.5)); + const CCTK_REAL_VEC hdzi CCTK_ATTRIBUTE_UNUSED = + kmul(dzi,ToReal(0.5)); /* Initialize predefined quantities */ const CCTK_REAL_VEC p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); @@ -106,16 +111,16 @@ static void WT_Standing_Body(const cGH* restrict const cctkGH, const int dir, co /* Precompute derivatives */ /* Calculate temporaries and grid functions */ - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED kvec = + CCTK_REAL_VEC kvec CCTK_ATTRIBUTE_UNUSED = ToReal(3.14159265358979323846264338328*ScalarINV(width)); - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED omega = + CCTK_REAL_VEC omega CCTK_ATTRIBUTE_UNUSED = ksqrt(kmul(kmul(kvec,kvec),ToReal(3))); - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED uL = + CCTK_REAL_VEC uL CCTK_ATTRIBUTE_UNUSED = kmul(kcos(kmul(xL,kvec)),kmul(kcos(kmul(yL,kvec)),kmul(kcos(kmul(zL,kvec)),kmul(kcos(kmul(omega,t)),ToReal(amplitude))))); - CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhoL = + CCTK_REAL_VEC rhoL CCTK_ATTRIBUTE_UNUSED = kneg(kmul(omega,kmul(kcos(kmul(xL,kvec)),kmul(kcos(kmul(yL,kvec)),kmul(kcos(kmul(zL,kvec)),kmul(ksin(kmul(omega,t)),ToReal(amplitude))))))); /* Copy local copies back to grid functions */ -- cgit v1.2.3