From 7a8264506609504681e6dbe580855f82675b308e Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 11 Oct 2022 18:43:48 -0400 Subject: [PATCH 1/2] use float/double constant for spline5_switch Same as #1647, but a function was missing. Signed-off-by: Jinzhe Zeng --- source/lib/include/switcher.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/lib/include/switcher.h b/source/lib/include/switcher.h index 606b3c3196..10d48c6c8b 100644 --- a/source/lib/include/switcher.h +++ b/source/lib/include/switcher.h @@ -76,18 +76,18 @@ spline5_switch ( const float & rmax) { if (xx < rmin) { - dd = 0; - vv = 1; + dd = (FTYPE)0.; + vv = (FTYPE)1.; } else if (xx < rmax) { FPTYPE uu = (xx - rmin) / (rmax - rmin) ; - FPTYPE du = 1. / (rmax - rmin) ; - vv = uu*uu*uu * (-6 * uu*uu + 15 * uu - 10) + 1; - dd = ( 3 * uu*uu * (-6 * uu*uu + 15 * uu - 10) + uu*uu*uu * (-12 * uu + 15) ) * du; + FPTYPE du = (FTYPE)1. / (rmax - rmin) ; + vv = uu*uu*uu * ((FTYPE)-6. * uu*uu + (FTYPE)15. * uu - (FTYPE)10.) + (FTYPE)1.; + dd = ( (FTYPE)3. * uu*uu * ((FTYPE)-6. * uu*uu + (FTYPE)15. * uu - (FTYPE)10.) + uu*uu*uu * ((FTYPE)-12. * uu + (FTYPE)15.) ) * du; } else { - dd = 0; - vv = 0; + dd = (FTYPE)0.; + vv = (FTYPE)0.; } } From 104b14a59acc732a6bae1e1ee7bf0ef430a89634 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Tue, 11 Oct 2022 18:47:01 -0400 Subject: [PATCH 2/2] fix typos Signed-off-by: Jinzhe Zeng --- source/lib/include/switcher.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/lib/include/switcher.h b/source/lib/include/switcher.h index 10d48c6c8b..e4d800bd14 100644 --- a/source/lib/include/switcher.h +++ b/source/lib/include/switcher.h @@ -76,18 +76,18 @@ spline5_switch ( const float & rmax) { if (xx < rmin) { - dd = (FTYPE)0.; - vv = (FTYPE)1.; + dd = (FPTYPE)0.; + vv = (FPTYPE)1.; } else if (xx < rmax) { FPTYPE uu = (xx - rmin) / (rmax - rmin) ; - FPTYPE du = (FTYPE)1. / (rmax - rmin) ; - vv = uu*uu*uu * ((FTYPE)-6. * uu*uu + (FTYPE)15. * uu - (FTYPE)10.) + (FTYPE)1.; - dd = ( (FTYPE)3. * uu*uu * ((FTYPE)-6. * uu*uu + (FTYPE)15. * uu - (FTYPE)10.) + uu*uu*uu * ((FTYPE)-12. * uu + (FTYPE)15.) ) * du; + FPTYPE du = (FPTYPE)1. / (rmax - rmin) ; + vv = uu*uu*uu * ((FPTYPE)-6. * uu*uu + (FPTYPE)15. * uu - (FPTYPE)10.) + (FPTYPE)1.; + dd = ( (FPTYPE)3. * uu*uu * ((FPTYPE)-6. * uu*uu + (FPTYPE)15. * uu - (FPTYPE)10.) + uu*uu*uu * ((FPTYPE)-12. * uu + (FPTYPE)15.) ) * du; } else { - dd = (FTYPE)0.; - vv = (FTYPE)0.; + dd = (FPTYPE)0.; + vv = (FPTYPE)0.; } }