cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a float/long double conversion that some complainers... um compilers complain about

Browse Source
This commit is contained in:
jpekkila
2019-08-08 18:12:24 +03:00
parent af24f17d1f
commit 168cdc9109
1 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/standalone/model/model_rk3.cc
View File

@@ -282,14 +282,11 @@ der6x_upwd(const int i, const int j, const int k, const ModelScalar* arr)
{ {
ModelScalar inv_ds = get(AC_inv_dsx); ModelScalar inv_ds = get(AC_inv_dsx);
return ModelScalar(1.0/60.0)*inv_ds* ( return ModelScalar(1.0 / 60.0) * inv_ds *
-ModelScalar( 20.0)* arr[IDX(i, j, k)] (-ModelScalar(20.0) * arr[IDX(i, j, k)] +
+ModelScalar( 15.0)*(arr[IDX(i+1, j, k)] ModelScalar(15.0) * (arr[IDX(i + 1, j, k)] + arr[IDX(i - 1, j, k)]) -
+ arr[IDX(i-1, j, k)]) ModelScalar(6.0) * (arr[IDX(i + 2, j, k)] + arr[IDX(i - 2, j, k)]) +
-ModelScalar( 6.0)*(arr[IDX(i+2, j, k)] arr[IDX(i + 3, j, k)] + arr[IDX(i - 3, j, k)]);
+ arr[IDX(i-2, j, k)])
+ arr[IDX(i+3, j, k)]
+ arr[IDX(i-3, j, k)]);
} }
static inline ModelScalar static inline ModelScalar
@@ -297,14 +294,11 @@ der6y_upwd(const int i, const int j, const int k, const ModelScalar* arr)
{ {
ModelScalar inv_ds = get(AC_inv_dsy); ModelScalar inv_ds = get(AC_inv_dsy);
return ModelScalar(1.0/60.0)*inv_ds* ( return ModelScalar(1.0 / 60.0) * inv_ds *
-ModelScalar( 20.0)* arr[IDX(i, j, k)] (-ModelScalar(20.0) * arr[IDX(i, j, k)] +
+ModelScalar( 15.0)*(arr[IDX(i, j+1, k)] ModelScalar(15.0) * (arr[IDX(i, j + 1, k)] + arr[IDX(i, j - 1, k)]) -
+ arr[IDX(i, j-1, k)]) ModelScalar(6.0) * (arr[IDX(i, j + 2, k)] + arr[IDX(i, j - 2, k)]) +
-ModelScalar( 6.0)*(arr[IDX(i, j+2, k)] arr[IDX(i, j + 3, k)] + arr[IDX(i, j - 3, k)]);
+ arr[IDX(i, j-2, k)])
+ arr[IDX(i, j+3, k)]
+ arr[IDX(i, j-3, k)]);
} }
static inline ModelScalar static inline ModelScalar
@@ -312,14 +306,11 @@ der6z_upwd(const int i, const int j, const int k, const ModelScalar* arr)
{ {
ModelScalar inv_ds = get(AC_inv_dsz); ModelScalar inv_ds = get(AC_inv_dsz);
return ModelScalar(1.0/60.0)*inv_ds* ( return ModelScalar(1.0 / 60.0) * inv_ds *
-ModelScalar( 20.0)* arr[IDX(i, j, k )] (-ModelScalar(20.0) * arr[IDX(i, j, k)] +
+ModelScalar( 15.0)*(arr[IDX(i, j, k+1)] ModelScalar(15.0) * (arr[IDX(i, j, k + 1)] + arr[IDX(i, j, k - 1)]) -
+ arr[IDX(i, j, k-1)]) ModelScalar(6.0) * (arr[IDX(i, j, k + 2)] + arr[IDX(i, j, k - 2)]) +
-ModelScalar( 6.0)*(arr[IDX(i, j, k+2)] arr[IDX(i, j, k + 3)] + arr[IDX(i, j, k - 3)]);
+ arr[IDX(i, j, k-2)])
+ arr[IDX(i, j, k+3)]
+ arr[IDX(i, j, k-3)]);
} }
#endif #endif
@@ -339,7 +330,8 @@ compute_gradient(const int i, const int j, const int k, const ModelScalar* arr)
static inline ModelVector static inline ModelVector
compute_upwind(const int i, const int j, const int k, const ModelScalar* arr) compute_upwind(const int i, const int j, const int k, const ModelScalar* arr)
{ {
return (ModelVector){der6x_upwd(i, j, k, arr), der6y_upwd(i, j, k, arr), der6z_upwd(i, j, k, arr)}; return (ModelVector){der6x_upwd(i, j, k, arr), der6y_upwd(i, j, k, arr),
der6z_upwd(i, j, k, arr)};
} }
#endif #endif
@@ -368,7 +360,7 @@ read_data(const int i, const int j, const int k, ModelScalar* buf[], const int h
data.hessian = compute_hessian(i, j, k, buf[handle]); data.hessian = compute_hessian(i, j, k, buf[handle]);
#if LUPWD #if LUPWD
data.upwind = compute_upwind(i, j, k, buf[handle]); data.upwind = compute_upwind(i, j, k, buf[handle]);
#endif #endif
return data; return data;
@@ -416,8 +408,6 @@ gradients(const ModelVectorData& data)
return (ModelMatrix){gradient(data.x), gradient(data.y), gradient(data.z)}; return (ModelMatrix){gradient(data.x), gradient(data.y), gradient(data.z)};
} }
/* /*
* ============================================================================= * =============================================================================
* Level 0.3 (Built-in functions available during the Stencil Processing Stage) * Level 0.3 (Built-in functions available during the Stencil Processing Stage)
@@ -571,10 +561,10 @@ contract(const ModelMatrix& mat)
ModelScalar ModelScalar
upwd_der6(const ModelVectorData& uu, const ModelScalarData& lnrho) upwd_der6(const ModelVectorData& uu, const ModelScalarData& lnrho)
{ {
ModelScalar uux = fabs(value(uu).x); ModelScalar uux = fabsl(value(uu).x);
ModelScalar uuy = fabs(value(uu).y); ModelScalar uuy = fabsl(value(uu).y);
ModelScalar uuz = fabs(value(uu).z); ModelScalar uuz = fabsl(value(uu).z);
return uux*lnrho.upwind.x + uuy*lnrho.upwind.y + uuz*lnrho.upwind.z; return uux * lnrho.upwind.x + uuy * lnrho.upwind.y + uuz * lnrho.upwind.z;
} }
#endif #endif
@@ -583,7 +573,7 @@ continuity(const ModelVectorData& uu, const ModelScalarData& lnrho)
{ {
return -dot(value(uu), gradient(lnrho)) return -dot(value(uu), gradient(lnrho))
#if LUPWD #if LUPWD
//This is a corrective hyperdiffusion term for upwinding. // This is a corrective hyperdiffusion term for upwinding.
+ upwd_der6(uu, lnrho) + upwd_der6(uu, lnrho)
#endif #endif
- divergence(uu); - divergence(uu);
@@ -760,24 +750,23 @@ helical_forcing(ModelScalar magnitude, ModelVector k_force, ModelVector xx, Mode
ModelVector ff_im, ModelScalar phi) ModelVector ff_im, ModelScalar phi)
{ {
(void)magnitude; // WARNING: unused (void)magnitude; // WARNING: unused
xx.x = xx.x*(2.0*M_PI/(get(AC_dsx)*get(AC_nx))); xx.x = xx.x * (2.0 * M_PI / (get(AC_dsx) * get(AC_nx)));
xx.y = xx.y*(2.0*M_PI/(get(AC_dsy)*get(AC_ny))); xx.y = xx.y * (2.0 * M_PI / (get(AC_dsy) * get(AC_ny)));
xx.z = xx.z*(2.0*M_PI/(get(AC_dsz)*get(AC_nz))); xx.z = xx.z * (2.0 * M_PI / (get(AC_dsz) * get(AC_nz)));
ModelScalar cos_phi = cosl(phi); ModelScalar cos_phi = cosl(phi);
ModelScalar sin_phi = sinl(phi); ModelScalar sin_phi = sinl(phi);
ModelScalar cos_k_dot_x = cosl(dot(k_force, xx)); ModelScalar cos_k_dot_x = cosl(dot(k_force, xx));
ModelScalar sin_k_dot_x = sinl(dot(k_force, xx)); ModelScalar sin_k_dot_x = sinl(dot(k_force, xx));
// Phase affect only the x-component // Phase affect only the x-component
//Scalar real_comp = cos_k_dot_x; // Scalar real_comp = cos_k_dot_x;
//Scalar imag_comp = sin_k_dot_x; // Scalar imag_comp = sin_k_dot_x;
ModelScalar real_comp_phase = cos_k_dot_x*cos_phi - sin_k_dot_x*sin_phi; ModelScalar real_comp_phase = cos_k_dot_x * cos_phi - sin_k_dot_x * sin_phi;
ModelScalar imag_comp_phase = cos_k_dot_x*sin_phi + sin_k_dot_x*cos_phi; ModelScalar imag_comp_phase = cos_k_dot_x * sin_phi + sin_k_dot_x * cos_phi;
ModelVector force = (ModelVector){ff_re.x * real_comp_phase - ff_im.x * imag_comp_phase,
ModelVector force = (ModelVector){ ff_re.x*real_comp_phase - ff_im.x*imag_comp_phase, ff_re.y * real_comp_phase - ff_im.y * imag_comp_phase,
ff_re.y*real_comp_phase - ff_im.y*imag_comp_phase, ff_re.z * real_comp_phase - ff_im.z * imag_comp_phase};
ff_re.z*real_comp_phase - ff_im.z*imag_comp_phase};
return force; return force;
} }