aboutsummaryrefslogtreecommitdiff
path: root/src/patch
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-01-18 16:18:55 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2003-01-18 16:18:55 +0000
commitf595463096694fd5901bf2503d20d0e30269653d (patch)
tree1c83b18881c71da4b6186bbb9ef94c16a5e2c4fe /src/patch
parent1b6cae274a3362d6b2e4e9502318dfd4b6216141 (diff)
Change various jtutil/ templates which used to be
template <typename fp> to template <typename fp_t> (that is, rename the tempalte parameter from "fp" to "fp_t"). The reason for this change is that elsewhere in this thorn, I use "fp" as a typedef for CCTK_REAL (= usually a typedef for double). Using the same name for both a specific type and a template parameter may be confusing to humans. It also may be confusing the Hitachi compiler... git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@925 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/patch')
-rw-r--r--src/patch/grid.hh10
-rw-r--r--src/patch/patch_edge.hh4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/patch/grid.hh b/src/patch/grid.hh
index 870ee06..d516bd7 100644
--- a/src/patch/grid.hh
+++ b/src/patch/grid.hh
@@ -614,13 +614,13 @@ public:
fp fp_irho_of_rho(fp rho) const
{ return rho_map().fp_int_of_fp(rho); }
int irho_of_rho(fp rho, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
const
{ return rho_map().int_of_fp(rho, nia); }
fp fp_isigma_of_sigma(fp sigma) const
{ return sigma_map().fp_int_of_fp(sigma); }
int isigma_of_sigma(fp sigma, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
const
{ return sigma_map().int_of_fp(sigma, nia); }
fp fp_iang_of_ang(bool want_rho, fp ang)
@@ -631,7 +631,7 @@ public:
}
int iang_of_ang(bool want_rho,
fp ang, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
const
{
return want_rho ? irho_of_rho(ang, nia)
@@ -653,12 +653,12 @@ public:
{ return jtutil::degrees_of_radians(sigma_of_isigma(isigma)); }
int irho_of_drho(fp drho, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
const
{ return irho_of_rho(jtutil::radians_of_degrees(drho), nia); }
int isigma_of_dsigma(fp dsigma,
jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
const
{
return isigma_of_sigma(jtutil::radians_of_degrees(dsigma), nia);
diff --git a/src/patch/patch_edge.hh b/src/patch/patch_edge.hh
index 4fba1b9..fa49713 100644
--- a/src/patch/patch_edge.hh
+++ b/src/patch/patch_edge.hh
@@ -144,10 +144,10 @@ public:
fp fp_ipar_of_par(fp par) const
{ return my_patch().fp_iang_of_ang(par_is_rho(), par); }
int iperp_of_perp(fp perp, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
{ return my_patch().iang_of_ang(perp_is_rho(), perp, nia); }
int ipar_of_par(fp par, jtutil::linear_map<fp>::noninteger_action
- nia = jtutil::linear_map<fp>::error)
+ nia = jtutil::linear_map<fp>::nia_error)
{ return my_patch().iang_of_ang(par_is_rho(), par, nia); }
// ... (perp,par) --> (rho,sigma)