From bf5da9ad86bebbb82f5d2e0aa85bb57a3c02823f Mon Sep 17 00:00:00 2001 From: jthorn Date: Thu, 21 Jun 2001 09:02:22 +0000 Subject: rename "jt/util++.hh" --> "jt/util.hh" git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@93 f88db872-0e4f-0410-b76b-b9085cfa78c5 --- src/patch/coords.cc | 2 +- src/patch/coords.hh | 2 +- src/patch/fd_grid.hh | 2 +- src/patch/ghost_zone.cc | 2 +- src/patch/ghost_zone.hh | 2 +- src/patch/grid.cc | 4 +- src/patch/grid.hh | 2 +- src/patch/patch.cc | 109 +--------------------------------------------- src/patch/patch.hh | 2 +- src/patch/patch_edge.hh | 2 +- src/patch/patch_interp.cc | 2 +- src/patch/test_fd_grid.cc | 2 +- 12 files changed, 13 insertions(+), 120 deletions(-) diff --git a/src/patch/coords.cc b/src/patch/coords.cc index 6c9d1d1..946e4be 100644 --- a/src/patch/coords.cc +++ b/src/patch/coords.cc @@ -18,7 +18,7 @@ #include #include "jt/stdc.h" -#include "jt/util++.hh" +#include "jt/util.hh" #include "fp.hh" #include "coords.hh" diff --git a/src/patch/coords.hh b/src/patch/coords.hh index affda20..0a87503 100644 --- a/src/patch/coords.hh +++ b/src/patch/coords.hh @@ -9,7 +9,7 @@ // // prerequisites: -// "jt/util++.hh" +// "jt/util.hh" // fp.hh // diff --git a/src/patch/fd_grid.hh b/src/patch/fd_grid.hh index a881f20..9e34170 100644 --- a/src/patch/fd_grid.hh +++ b/src/patch/fd_grid.hh @@ -14,7 +14,7 @@ // // // // for M_PI (used by degree/radian conversions) -// "jt/util++.hh" // jtutil:: stuff: +// "jt/util.hh" // jtutil:: stuff: // // how_many_in_range(), // // degrees_of_radians(), radians_of_degrees(), // "jt/array.hh" diff --git a/src/patch/ghost_zone.cc b/src/patch/ghost_zone.cc index be400c0..84623f0 100644 --- a/src/patch/ghost_zone.cc +++ b/src/patch/ghost_zone.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "policy.hh" diff --git a/src/patch/ghost_zone.hh b/src/patch/ghost_zone.hh index e4e8c67..32e13a7 100644 --- a/src/patch/ghost_zone.hh +++ b/src/patch/ghost_zone.hh @@ -11,7 +11,7 @@ // // // -// "jt/util++.hh" +// "jt/util.hh" // "jt/array.hh" // "jt/linear_map.hh" // fp.hh diff --git a/src/patch/grid.cc b/src/patch/grid.cc index 6119f4e..d1b784d 100644 --- a/src/patch/grid.cc +++ b/src/patch/grid.cc @@ -9,12 +9,10 @@ #include #include -#include #include -#include #include "jt/stdc.h" -#include "jt/util++.hh" // jtutil::how_many_in_range(), +#include "jt/util.hh" // jtutil::how_many_in_range(), // round::, fuzzy:: #include "jt/array.hh" #include "jt/linear_map.hh" diff --git a/src/patch/grid.hh b/src/patch/grid.hh index fd15d20..2d6a120 100644 --- a/src/patch/grid.hh +++ b/src/patch/grid.hh @@ -10,7 +10,7 @@ // // // // for M_PI (used by degree/radian conversions) -// "jt/util++.hh" // jtutil:: stuff: +// "jt/util.hh" // jtutil:: stuff: // // how_many_in_range(), // // degrees_of_radians(), radians_of_degrees(), // "jt/array.hh" diff --git a/src/patch/patch.cc b/src/patch/patch.cc index 956f85d..d67569a 100644 --- a/src/patch/patch.cc +++ b/src/patch/patch.cc @@ -15,24 +15,13 @@ // patch::setup_patch_frontier // patch::border_on_edge // -// patch::write_grid3d_gridfn_at_iwr -// patch::write_grid3d_gridfn__adat -// patch::radially_extrapolate_gridfn_vector -// *** template instantiations for patch::radially_extrapolate_gridfn_vector -// #include #include -#include #include -#include - -#include -#include -#include -#include -#include +#include "jt/stdc.h" +#include "jt/util.hh" #include "policy.hh" #include "fp.hh" @@ -311,97 +300,3 @@ return edge_in.edge_is_min() : ( edge_in.edge_is_rho() ? max_rho_ghost_zone() : max_sigma_ghost_zone() ); } - -//***************************************************************************** -//***************************************************************************** -//***************************************************************************** - -// -// This function writes the values of a grid3d gridfn at a specified iwr -// to the already-open stdio stream output_fp (which is *not* closed -// when we're through), using the format -// # dpx dpy gridfn -// Each set of dpx = const lines is followed by a blank line. -// Each patch is followed by two blank lines. -// -void patch::write_grid3d_gridfn__adat(FILE *output_fp, - int gfn, - int iwr, bool want_borders) - const -{ -if (output_fp == NULL) - then error_exit(PANIC_EXIT, -"***** patch::write_grid3d_gridfn__adat:\n" -" got NULL output stream for gfn=%d iwr=%d!\n" -, - gfn, iwr); /*NOTREACHED*/ - -fprintf(output_fp, - "# %s patch: (dpx,dpy) = (%s,%s)\n", - name(), defn_of_dpx(), defn_of_dpy()); -fprintf(output_fp, - "# dpx\tdpy\tgridfn\n"); - - for (int irho = effective_min_irho(want_borders) ; - irho <= effective_max_irho(want_borders) ; - ++irho) - { - for (int isigma = effective_min_isigma(want_borders) ; - isigma <= effective_max_isigma(want_borders) ; - ++isigma) - { - fprintf(output_fp, - "%g\t%g\t%.20e\n", - double(dpx_of_irho_isigma(irho,isigma)), - double(dpy_of_irho_isigma(irho,isigma)), - double(gridfn__grid3d(gfn, iwr, irho, isigma))); - } - fprintf(output_fp, "\n"); - } - -fprintf(output_fp, "\n"); -} - -//***************************************************************************** - -// -// This function does radial extrapolation at a specified radial border, -// for all the gridfns in a specified gridfn vector. -// The loop nesting is cache-optimized for interleaved gridfns. -// -template -void patch::radially_extrapolate_gridfn_vector(radial_extrapolation_type ret, - const gridfn_vector& gv) -{ - for (int irho = bordered_min_irho() ; - irho <= bordered_max_irho() ; - ++irho) - { - for (int isigma = bordered_min_isigma() ; - isigma <= bordered_max_isigma() ; - ++isigma) - { - for (int ii = 0 ; ii < gv.N_gridfns() ; ++ii) - { - const int gfn = gv.ith_gfn(ii); - - radially_extrapolate(ret, gfn, irho,isigma); - } - } - } -} - -//***************************************************************************** - -// -// *** template instantiations for patch::radially_extrapolate_gridfn_range -// - -template - void patch::radially_extrapolate_gridfn_vector - (radial_extrapolation_type ret, - const gridfn_vector& gv); -template - void patch::radially_extrapolate_gridfn_vector - (radial_extrapolation_type ret, - const gridfn_vector& gv); diff --git a/src/patch/patch.hh b/src/patch/patch.hh index 62abe20..e95b2e6 100644 --- a/src/patch/patch.hh +++ b/src/patch/patch.hh @@ -14,7 +14,7 @@ // // // -// "jt/util++.hh" +// "jt/util.hh" // "jt/array.hh" // "jt/linear_map.hh" // fp.hh diff --git a/src/patch/patch_edge.hh b/src/patch/patch_edge.hh index 233b70b..5fc9e75 100644 --- a/src/patch/patch_edge.hh +++ b/src/patch/patch_edge.hh @@ -7,7 +7,7 @@ // // // -// "jt/util++.hh" +// "jt/util.hh" // "jt/array.hh" // "jt/linear_map.hh" // fp.hh diff --git a/src/patch/patch_interp.cc b/src/patch/patch_interp.cc index 1a277af..39f5524 100644 --- a/src/patch/patch_interp.cc +++ b/src/patch/patch_interp.cc @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "policy.hh" diff --git a/src/patch/test_fd_grid.cc b/src/patch/test_fd_grid.cc index f23092a..91e16be 100644 --- a/src/patch/test_fd_grid.cc +++ b/src/patch/test_fd_grid.cc @@ -14,7 +14,7 @@ #include #include "jt/stdc.h" -#include "jt/util++.hh" +#include "jt/util.hh" #include "jt/array.hh" #include "jt/linear_map.hh" -- cgit v1.2.3