aboutsummaryrefslogtreecommitdiff
path: root/Carpet
diff options
context:
space:
mode:
authorschnetter <>2004-03-23 14:37:00 +0000
committerschnetter <>2004-03-23 14:37:00 +0000
commitb2cd9a4edddda724645dc2dbc8216d42a2e67982 (patch)
tree1e6b68d2e7976ed00e21b6cebbaf2ca320a80717 /Carpet
parenteeacd9e9402896b2d72391e773e73460814e569e (diff)
Fix indentation
darcs-hash:20040323143721-07bb3-82c87a31b23f2fe7d42708f1415fb413b50733c8.gz
Diffstat (limited to 'Carpet')
-rw-r--r--Carpet/CarpetLib/src/data.cc23
-rw-r--r--Carpet/CarpetLib/src/data.hh18
2 files changed, 26 insertions, 15 deletions
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index ec6c87858..10d4a4c17 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.47 2004/03/23 12:40:27 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.48 2004/03/23 15:37:21 schnetter Exp $
#include <assert.h>
#include <limits.h>
@@ -61,7 +61,8 @@ data<T,D>::data (const int varindex_, const operator_type transport_operator_,
// Destructors
template<class T, int D>
-data<T,D>::~data () {
+data<T,D>::~data ()
+{
free();
}
@@ -78,8 +79,10 @@ data<T,D>* data<T,D>::make_typed (const int varindex_,
// Storage management
template<class T, int D>
-void data<T,D>::allocate (const ibbox& extent_, const int proc_,
- void* const mem) {
+void data<T,D>::allocate (const ibbox& extent_,
+ const int proc_,
+ void* const mem)
+{
assert (!this->_has_storage);
this->_has_storage = true;
// data
@@ -113,7 +116,8 @@ void data<T,D>::allocate (const ibbox& extent_, const int proc_,
}
template<class T, int D>
-void data<T,D>::free () {
+void data<T,D>::free ()
+{
if (this->_storage && this->_owns_storage && this->vectorindex==0) {
delete [] _storage;
}
@@ -122,7 +126,8 @@ void data<T,D>::free () {
}
template<class T, int D>
-void data<T,D>::transfer_from (gdata<D>* gsrc) {
+void data<T,D>::transfer_from (gdata<D>* gsrc)
+{
assert (this->vectorlength==1);
data* src = (data*)gsrc;
assert (src->vectorlength==1);
@@ -146,7 +151,8 @@ T* data<T,D>::vectordata (const int vectorindex) const
// Processor management
template<class T, int D>
void data<T,D>::change_processor (comm_state<D>& state,
- const int newproc, void* const mem)
+ const int newproc,
+ void* const mem)
{
switch (state.thestate) {
case state_recv:
@@ -1287,7 +1293,8 @@ void data<CCTK_REAL8,3>
// Output
template<class T,int D>
-ostream& data<T,D>::output (ostream& os) const {
+ostream& data<T,D>::output (ostream& os) const
+{
T Tdummy;
os << "data<" << typestring(Tdummy) << "," << D << ">:"
<< "extent=" << this->extent() << ","
diff --git a/Carpet/CarpetLib/src/data.hh b/Carpet/CarpetLib/src/data.hh
index 85e8a28fe..b8c3e360d 100644
--- a/Carpet/CarpetLib/src/data.hh
+++ b/Carpet/CarpetLib/src/data.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.hh,v 1.18 2004/03/23 12:40:27 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.hh,v 1.19 2004/03/23 15:37:21 schnetter Exp $
#ifndef DATA_HH
#define DATA_HH
@@ -22,7 +22,8 @@ using namespace std;
// A real data storage
template<class T,int D>
-class data: public gdata<D> {
+class data: public gdata<D>
+{
// Types
typedef vect<int,D> ivect;
@@ -67,14 +68,15 @@ public:
// Processor management
virtual void change_processor (comm_state<D>& state,
const int newproc, void* const mem=0);
- private:
+private:
virtual void change_processor_recv (const int newproc, void* const mem=0);
virtual void change_processor_send (const int newproc, void* const mem=0);
virtual void change_processor_wait (const int newproc, void* const mem=0);
- public:
+public:
// Accessors
- virtual const void* storage () const {
+ virtual const void* storage () const
+ {
assert (this->_has_storage);
return _storage;
}
@@ -85,12 +87,14 @@ public:
}
// Data accessors
- const T& operator[] (const ivect& index) const {
+ const T& operator[] (const ivect& index) const
+ {
assert (_storage);
return _storage[offset(index)];
}
- T& operator[] (const ivect& index) {
+ T& operator[] (const ivect& index)
+ {
assert (_storage);
return _storage[offset(index)];
}