aboutsummaryrefslogtreecommitdiff
path: root/Carpet/Requirements/src/Requirements.cc
diff options
context:
space:
mode:
Diffstat (limited to 'Carpet/Requirements/src/Requirements.cc')
-rw-r--r--Carpet/Requirements/src/Requirements.cc29
1 files changed, 2 insertions, 27 deletions
diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc
index 19a67f9fd..538c96188 100644
--- a/Carpet/Requirements/src/Requirements.cc
+++ b/Carpet/Requirements/src/Requirements.cc
@@ -21,6 +21,7 @@
#include <all_clauses.hh>
#include <clause.hh>
#include <clauses.hh>
+#include <location.hh>
#include <util.hh>
using namespace std;
@@ -53,33 +54,7 @@ namespace Requirements {
bool there_was_an_error = false;
bool there_was_a_warning = false;
- // Struct defining a location of a grid point
- struct location_t {
- int it, vi, tl, rl, m;
- char const* info;
- location_t():
- it(-1), vi(-1), tl(-1), rl(-1), m(-1), info("")
- {}
- location_t(int _it, int _vi, int _tl, int _rl, int _m, char const* _info):
- it(_it), vi(_vi), tl(_tl), rl(_rl), m(_m), info(_info)
- {}
- // Output helper
- void output (ostream& os) const;
- };
-
- inline ostream& operator<< (ostream& os, const location_t& a) {
- a.output(os);
- return os;
- }
-
- void location_t::output(ostream& os) const
- {
- os << "vi:" << vi << ",it:" << it << ", ";
- os << "[rl:" << rl << ",";
- os << "tl:" << tl << ",";
- os << "m:" << m << "]";
- }
-
+
// Represents which have valid information and which do not.
// This will later be indexed by rl, map etc.
// Currently only works with unigrid.