diff options
author | Erik Schnetter <schnetter@gmail.com> | 2013-08-04 00:26:46 -0400 |
---|---|---|
committer | Erik Schnetter <schnetter@gmail.com> | 2013-08-04 00:26:46 -0400 |
commit | 3a4bc5a1416ea920644f3e0850920898f52459aa (patch) | |
tree | a95b8a3aecec90cf8c00c5b09391196a28915dc0 /Carpet | |
parent | 60860682850aca790187e17d7f2badd34a22345d (diff) |
CarpetLib: Remove some outdated, commented-out code
Diffstat (limited to 'Carpet')
-rw-r--r-- | Carpet/CarpetLib/src/gf.cc | 31 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/gf.hh | 14 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/ggf.cc | 5 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/ggf.hh | 7 |
4 files changed, 0 insertions, 57 deletions
diff --git a/Carpet/CarpetLib/src/gf.cc b/Carpet/CarpetLib/src/gf.cc index 8a27f9eef..939c34373 100644 --- a/Carpet/CarpetLib/src/gf.cc +++ b/Carpet/CarpetLib/src/gf.cc @@ -39,37 +39,6 @@ gf<T>::~gf () -#if 0 -// Access to the data -template<typename T> -const data<T>* gf<T>::operator() (int tl, int rl, int lc, int ml) const -{ - assert (rl>=0 and rl<h.reflevels()); - assert (lc>=0 and lc<h.local_components(rl)); - assert (ml>=0 and ml<h.mglevels()); - assert (tl>=0 and tl<timelevels(ml, rl)); - return (const data<T>*)storage.AT(ml).AT(rl).AT(lc).AT(tl); -} - -template<typename T> -data<T>* gf<T>::operator() (int tl, int rl, int lc, int ml) -{ - assert (rl>=0 and rl<h.reflevels()); - assert (lc>=0 and lc<h.local_components(rl)); - assert (ml>=0 and ml<h.mglevels()); - if (not (tl>=0 and tl<timelevels(ml, rl))) { - cerr << "gf<T>::operator() " - << "vi=" << varindex << " name=" << (varindex>=0 ? CCTK_FullName(varindex) : "") << " " - << "pot=" << prolongation_order_time << " " - << "tl=" << tl << " rl=" << rl << " lc=" << lc << " ml=" << ml << "\n"; - } - assert (tl>=0 and tl<timelevels(ml, rl)); - return (data<T>*)storage.AT(ml).AT(rl).AT(lc).AT(tl); -} -#endif - - - // Memory usage template<typename T> size_t diff --git a/Carpet/CarpetLib/src/gf.hh b/Carpet/CarpetLib/src/gf.hh index bf58ac7ff..2711b4309 100644 --- a/Carpet/CarpetLib/src/gf.hh +++ b/Carpet/CarpetLib/src/gf.hh @@ -22,13 +22,6 @@ using namespace std; // A real grid function template<typename T> class gf: public ggf { - - // Types - typedef data<T>* tdata; // data ... - typedef vector<tdata> mdata; // ... for each multigrid level - typedef vector<mdata> cdata; // ... for each component - typedef vector<cdata> rdata; // ... for each refinement level - typedef vector<rdata> fdata; // ... for each time level public: @@ -69,13 +62,6 @@ public: // Access to the data -#if 0 - virtual const data<T>* operator() (int tl, int rl, int lc, int ml) const - CCTK_MEMBER_ATTRIBUTE_PURE; - virtual data<T>* operator() (int tl, int rl, int lc, int ml) - CCTK_MEMBER_ATTRIBUTE_PURE; -#endif - data<T> const* typed_data_pointer (int tl, int rl, int lc, int ml) const { assert (rl>=0 and rl<h.reflevels()); diff --git a/Carpet/CarpetLib/src/ggf.cc b/Carpet/CarpetLib/src/ggf.cc index ebc81cb6d..84f867c46 100644 --- a/Carpet/CarpetLib/src/ggf.cc +++ b/Carpet/CarpetLib/src/ggf.cc @@ -132,13 +132,8 @@ void ggf::recompose_allocate (const int rl) oldstorage.resize(storage.size()); for (int ml=0; ml<(int)storage.size(); ++ml) { oldstorage.AT(ml).resize(storage.AT(ml).size()); -#if 0 - oldstorage.AT(ml).AT(rl) = storage.AT(ml).AT(rl); - storage.AT(ml).AT(rl).clear(); -#else oldstorage.AT(ml).AT(rl).clear(); swap (storage.AT(ml).AT(rl), oldstorage.AT(ml).AT(rl)); -#endif } for (int ml=0; ml<d.h.mglevels(); ++ml) { diff --git a/Carpet/CarpetLib/src/ggf.hh b/Carpet/CarpetLib/src/ggf.hh index d55deb270..6fcd4fa95 100644 --- a/Carpet/CarpetLib/src/ggf.hh +++ b/Carpet/CarpetLib/src/ggf.hh @@ -214,13 +214,6 @@ public: return storage.AT(ml).AT(rl).AT(lc).AT(tl); } -#if 0 - virtual const gdata* operator() (int tl, int rl, int lc, int ml) const - CCTK_MEMBER_ATTRIBUTE_PURE = 0; - virtual gdata* operator() (int tl, int rl, int lc, int ml) - CCTK_MEMBER_ATTRIBUTE_PURE = 0; -#endif - // Output |