From adb6ad935f14ad60ee10a78100e8c223a14ed060 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Fri, 3 Jan 2003 14:49:00 +0000 Subject: Removed the "dimgeneric_*" data types from CarpetLib. They were never Removed the "dimgeneric_*" data types from CarpetLib. They were never really used anyway. Changed "th" into "th". Renamed "generic_*" to "g*". Propagated these changes to all other places. darcs-hash:20030103144936-07bb3-c4d74d2d94a56a898f9bb735666eefc01e2610e2.gz --- Carpet/CarpetLib/src/gdata.cc | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) (limited to 'Carpet/CarpetLib/src/gdata.cc') diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc index 76184b3d1..86f5f89c3 100644 --- a/Carpet/CarpetLib/src/gdata.cc +++ b/Carpet/CarpetLib/src/gdata.cc @@ -1,22 +1,4 @@ -/*************************************************************************** - gdata.cc - description - ------------------- - begin : Wed Jul 19 2000 - copyright : (C) 2000 by Erik Schnetter - email : schnetter@astro.psu.edu - - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.20 2002/09/25 15:49:16 schnetter Exp $ - - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.21 2003/01/03 15:49:36 schnetter Exp $ #include @@ -37,18 +19,19 @@ using namespace std; // Constructors template -generic_data::generic_data () +gdata::gdata () + : _has_storage(false) { } // Destructors template -generic_data::~generic_data () { } +gdata::~gdata () { } // Data manipulators template -void generic_data::copy_from (const generic_data* src, const ibbox& box) +void gdata::copy_from (const gdata* src, const ibbox& box) { assert (has_storage() && src->has_storage()); assert (all(box.lower()>=extent().lower() @@ -72,7 +55,7 @@ void generic_data::copy_from (const generic_data* src, const ibbox& box) } else { // copy to different processor - generic_data* const tmp = make_typed(); + gdata* const tmp = make_typed(); tmp->allocate (box, src->proc()); tmp->copy_from (src, box); tmp->change_processor (proc()); @@ -85,8 +68,8 @@ void generic_data::copy_from (const generic_data* src, const ibbox& box) template -void generic_data -::interpolate_from (const vector srcs, +void gdata +::interpolate_from (const vector srcs, const vector times, const ibbox& box, const CCTK_REAL time, const int order_space, @@ -117,7 +100,7 @@ void generic_data } else { // interpolate from other processor - generic_data* const tmp = make_typed(); + gdata* const tmp = make_typed(); tmp->allocate (box, srcs[0]->proc()); tmp->interpolate_from (srcs, times, box, time, order_space, order_time); tmp->change_processor (proc()); @@ -129,4 +112,4 @@ void generic_data -template class generic_data<3>; +template class gdata<3>; -- cgit v1.2.3