Skip to content

Commit 18b6541

Browse files
lukelowrylukelowry
committed
remoe data() use getData instead
1 parent 9c61a08 commit 18b6541

56 files changed

Lines changed: 201 additions & 211 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎GridKit/LinearAlgebra/Vector/Vector.hpp‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,16 @@ namespace GridKit
6464
return static_cast<std::size_t>(getSize());
6565
}
6666

67-
ScalarT* data(memory::MemorySpace memspace = memory::HOST)
68-
{
69-
return getData(memspace);
70-
}
71-
72-
const ScalarT* data(memory::MemorySpace memspace = memory::HOST) const
73-
{
74-
return getData(memspace);
75-
}
76-
7767
ScalarT& operator[](std::size_t i)
7868
{
7969
assert(i < size());
80-
return data()[i];
70+
return getData(memory::HOST)[i];
8171
}
8272

8373
const ScalarT& operator[](std::size_t i) const
8474
{
8575
assert(i < size());
86-
return data()[i];
76+
return getData(memory::HOST)[i];
8777
}
8878

8979
IdxT getCapacity() const;

‎GridKit/Model/PhasorDynamics/Branch/BranchEnzyme.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ namespace GridKit
4545
static_cast<size_t>((bus1_->y()).size()),
4646
(bus1_->getResidualIndices()).data(),
4747
(bus1_->getVariableIndices()).data(),
48-
y_.data(),
49-
yp_.data(),
50-
(bus1_->y()).data(),
48+
y_.getData(memory::HOST),
49+
yp_.getData(memory::HOST),
50+
(bus1_->y()).getData(memory::HOST),
5151
J_rows_buffer_,
5252
J_cols_buffer_,
5353
J_vals_buffer_,
@@ -60,9 +60,9 @@ namespace GridKit
6060
static_cast<size_t>((bus2_->y()).size()),
6161
(bus2_->getResidualIndices()).data(),
6262
(bus2_->getVariableIndices()).data(),
63-
y_.data(),
64-
yp_.data(),
65-
(bus2_->y()).data(),
63+
y_.getData(memory::HOST),
64+
yp_.getData(memory::HOST),
65+
(bus2_->y()).getData(memory::HOST),
6666
J_rows_buffer_,
6767
J_cols_buffer_,
6868
J_vals_buffer_,
@@ -75,9 +75,9 @@ namespace GridKit
7575
static_cast<size_t>((bus2_->y()).size()),
7676
(bus1_->getResidualIndices()).data(),
7777
(bus2_->getVariableIndices()).data(),
78-
y_.data(),
79-
yp_.data(),
80-
(bus2_->y()).data(),
78+
y_.getData(memory::HOST),
79+
yp_.getData(memory::HOST),
80+
(bus2_->y()).getData(memory::HOST),
8181
J_rows_buffer_,
8282
J_cols_buffer_,
8383
J_vals_buffer_,
@@ -90,9 +90,9 @@ namespace GridKit
9090
static_cast<size_t>((bus1_->y()).size()),
9191
(bus2_->getResidualIndices()).data(),
9292
(bus1_->getVariableIndices()).data(),
93-
y_.data(),
94-
yp_.data(),
95-
(bus1_->y()).data(),
93+
y_.getData(memory::HOST),
94+
yp_.getData(memory::HOST),
95+
(bus1_->y()).getData(memory::HOST),
9696
J_rows_buffer_,
9797
J_cols_buffer_,
9898
J_vals_buffer_,

‎GridKit/Model/PhasorDynamics/Bus/BusImpl.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ namespace GridKit
165165
template <typename scalar_type, typename index_type>
166166
int Bus<scalar_type, index_type>::setAbsoluteTolerance(RealT rel_tol)
167167
{
168-
std::fill(abs_tol_.data(), abs_tol_.data() + abs_tol_.size(), rel_tol);
168+
std::fill(abs_tol_.getData(memory::HOST), abs_tol_.getData(memory::HOST) + abs_tol_.size(), rel_tol);
169169
return 0;
170170
}
171171

‎GridKit/Model/PhasorDynamics/BusFault/BusFaultEnzyme.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ namespace GridKit
4444
y_.size(),
4545
(this->getResidualIndices()).data(),
4646
(this->getVariableIndices()).data(),
47-
y_.data(),
48-
yp_.data(),
47+
y_.getData(memory::HOST),
48+
yp_.getData(memory::HOST),
4949
wb_.data(),
5050
J_rows_buffer_,
5151
J_cols_buffer_,
@@ -59,9 +59,9 @@ namespace GridKit
5959
static_cast<size_t>(bus_->size()),
6060
(this->getResidualIndices()).data(),
6161
(bus_->getVariableIndices()).data(),
62-
y_.data(),
63-
yp_.data(),
64-
(bus_->y()).data(),
62+
y_.getData(memory::HOST),
63+
yp_.getData(memory::HOST),
64+
(bus_->y()).getData(memory::HOST),
6565
J_rows_buffer_,
6666
J_cols_buffer_,
6767
J_vals_buffer_,
@@ -80,8 +80,8 @@ namespace GridKit
8080
y_.size(),
8181
(bus_->getResidualIndices()).data(),
8282
(this->getVariableIndices()).data(),
83-
y_.data(),
84-
yp_.data(),
83+
y_.getData(memory::HOST),
84+
yp_.getData(memory::HOST),
8585
wb_.data(),
8686
J_rows_buffer_,
8787
J_cols_buffer_,

‎GridKit/Model/PhasorDynamics/BusFault/BusFaultImpl.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ namespace GridKit
198198
template <class scalar_type, typename index_type>
199199
int BusFault<scalar_type, index_type>::setAbsoluteTolerance(RealT rel_tol)
200200
{
201-
std::fill(abs_tol_.data(), abs_tol_.data() + abs_tol_.size(), rel_tol);
201+
std::fill(abs_tol_.getData(memory::HOST), abs_tol_.getData(memory::HOST) + abs_tol_.size(), rel_tol);
202202
return 0;
203203
}
204204

@@ -254,16 +254,16 @@ namespace GridKit
254254
{
255255
wb_[0] = Vr();
256256
wb_[1] = Vi();
257-
evaluateInternalResidual(y_.data(), yp_.data(), wb_.data(), f_.data());
258-
evaluateBusResidual(y_.data(), yp_.data(), wb_.data(), h_.data());
257+
evaluateInternalResidual(y_.getData(memory::HOST), yp_.getData(memory::HOST), wb_.data(), f_.getData(memory::HOST));
258+
evaluateBusResidual(y_.getData(memory::HOST), yp_.getData(memory::HOST), wb_.data(), h_.data());
259259
Ir() += h_[0];
260260
Ii() += h_[1];
261261
}
262262
else
263263
{
264264
wb_[0] = 0.0;
265265
wb_[1] = 0.0;
266-
evaluateInternalResidual(y_.data(), yp_.data(), wb_.data(), f_.data());
266+
evaluateInternalResidual(y_.getData(memory::HOST), yp_.getData(memory::HOST), wb_.data(), f_.getData(memory::HOST));
267267
}
268268

269269
return 0;

‎GridKit/Model/PhasorDynamics/Exciter/IEEET1/Ieeet1Enzyme.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ namespace GridKit
4747
y_.size(),
4848
(this->getResidualIndices()).data(),
4949
(this->getVariableIndices()).data(),
50-
y_.data(),
51-
yp_.data(),
50+
y_.getData(memory::HOST),
51+
yp_.getData(memory::HOST),
5252
wb_.data(),
5353
ws_.data(),
5454
J_rows_buffer_,
@@ -62,8 +62,8 @@ namespace GridKit
6262
y_.size(),
6363
(this->getResidualIndices()).data(),
6464
(this->getVariableIndices()).data(),
65-
y_.data(),
66-
yp_.data(),
65+
y_.getData(memory::HOST),
66+
yp_.getData(memory::HOST),
6767
wb_.data(),
6868
ws_.data(),
6969
alpha_,
@@ -78,9 +78,9 @@ namespace GridKit
7878
static_cast<size_t>(bus_->size()),
7979
(this->getResidualIndices()).data(),
8080
(bus_->getVariableIndices()).data(),
81-
y_.data(),
82-
yp_.data(),
83-
(bus_->y()).data(),
81+
y_.getData(memory::HOST),
82+
yp_.getData(memory::HOST),
83+
(bus_->y()).getData(memory::HOST),
8484
ws_.data(),
8585
J_rows_buffer_,
8686
J_cols_buffer_,
@@ -93,8 +93,8 @@ namespace GridKit
9393
ws_.size(),
9494
(this->getResidualIndices()).data(),
9595
ws_indices_.data(),
96-
y_.data(),
97-
yp_.data(),
96+
y_.getData(memory::HOST),
97+
yp_.getData(memory::HOST),
9898
wb_.data(),
9999
ws_.data(),
100100
J_rows_buffer_,

‎GridKit/Model/PhasorDynamics/Exciter/IEEET1/Ieeet1Impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ namespace GridKit
261261
template <typename scalar_type, typename index_type>
262262
int Ieeet1<scalar_type, index_type>::setAbsoluteTolerance(RealT rel_tol)
263263
{
264-
std::fill(abs_tol_.data(), abs_tol_.data() + abs_tol_.size(), rel_tol);
264+
std::fill(abs_tol_.getData(memory::HOST), abs_tol_.getData(memory::HOST) + abs_tol_.size(), rel_tol);
265265
return 0;
266266
}
267267

@@ -350,7 +350,7 @@ namespace GridKit
350350
wb_[1] = bus_->Vi();
351351

352352
// Residual evaluation
353-
evaluateInternalResidual(y_.data(), yp_.data(), wb_.data(), ws_.data(), f_.data());
353+
evaluateInternalResidual(y_.getData(memory::HOST), yp_.getData(memory::HOST), wb_.data(), ws_.data(), f_.getData(memory::HOST));
354354

355355
return 0;
356356
}

0 commit comments

Comments
 (0)