Commit 7efea9f4 authored by Ethan Coon's avatar Ethan Coon
Browse files

changes to using bracket notation instead of parenthetical notation in readers...

changes to using bracket notation instead of parenthetical notation in readers as this is what is supported by legion.  may require updating other test infrastructure in tests_c
parent 71c341fe
......@@ -58,7 +58,7 @@ void read_phenology(const std::string& fname,
// LAI. Good for C order, bad for Fortran
for (int i=offset; i!=offset+n_grid_cells; ++i) {
for (int j=0; j!=n_pfts; ++j) {
lai(i,j) = data[(i-offset)*n_pfts + j];
lai[i][j] = data[(i-offset)*n_pfts + j];
}
}
......@@ -73,7 +73,7 @@ void read_phenology(const std::string& fname,
// LAI. Good for C order, bad for Fortran
for (int i=offset; i!=offset+n_grid_cells; ++i) {
for (int j=0; j!=n_pfts; ++j) {
sai(i,j) = data[(i-offset)*n_pfts + j];
sai[i][j] = data[(i-offset)*n_pfts + j];
}
}
......
......@@ -12,6 +12,7 @@ class VectorStatic {
public:
VectorStatic() {}
VectorStatic(T t) { *this = t; }
VectorStatic(const VectorStatic<N,T>& other) = default;
T& operator()(size_t i) { return d_[i]; }
const T& operator()(size_t i) const { return d_[i]; }
......@@ -35,6 +36,7 @@ class MatrixStatic {
public:
MatrixStatic() {}
MatrixStatic(T t) { *this = t; }
MatrixStatic(const MatrixStatic<ROW,COL,T>& other) = default;
T& operator()(size_t i, size_t j) { return d_[i][j]; }
const T& operator()(size_t i, size_t j) const { return d_[i][j]; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment