Skip to content

Commit 293c046

Browse files
lukelowrylukelowry
committed
remove size alias
1 parent b6a759c commit 293c046

61 files changed

Lines changed: 219 additions & 231 deletions

File tree

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.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <cassert>
2+
#include <cstring>
23

34
#include <GridKit/AutomaticDifferentiation/DependencyTracking/Variable.hpp>
45
#include <GridKit/LinearAlgebra/Vector/Vector.hpp>
@@ -54,20 +55,11 @@ namespace GridKit
5455
Vector<ScalarT, IdxT>::~Vector()
5556
{
5657
if (owns_cpu_data_ && h_data_)
57-
{
5858
mem_.deleteOnHost(h_data_);
59-
}
6059
if (owns_gpu_data_ && d_data_)
61-
{
6260
mem_.deleteOnDevice(d_data_);
63-
}
6461
delete[] gpu_updated_;
6562
delete[] cpu_updated_;
66-
67-
h_data_ = nullptr;
68-
d_data_ = nullptr;
69-
gpu_updated_ = nullptr;
70-
cpu_updated_ = nullptr;
7163
}
7264

7365
/**

‎GridKit/LinearAlgebra/Vector/Vector.hpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#include <cstddef>
32
#include <string>
43

54
#include <GridKit/MemoryUtilities/MemoryUtils.hpp>
@@ -58,11 +57,6 @@ namespace GridKit
5857
const ScalarT* getData(memory::MemorySpace memspace = memory::HOST) const;
5958
const ScalarT* getData(IdxT i, memory::MemorySpace memspace = memory::HOST) const;
6059

61-
std::size_t size() const
62-
{
63-
return static_cast<std::size_t>(getSize());
64-
}
65-
6660
IdxT getCapacity() const;
6761
IdxT getSize() const;
6862
IdxT getNumVectors() const;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace GridKit
4242
GridKit::Enzyme::Sparse::DhDwb<GridKit::PhasorDynamics::Branch<ScalarT, IdxT>,
4343
GridKit::Enzyme::Sparse::MemberFunctions::BusResidual11>::eval(this,
4444
static_cast<size_t>(bus1_->size()),
45-
static_cast<size_t>((bus1_->y()).size()),
45+
static_cast<size_t>((bus1_->y()).getSize()),
4646
(bus1_->getResidualIndices()).data(),
4747
(bus1_->getVariableIndices()).data(),
4848
y_.getData(),
@@ -57,7 +57,7 @@ namespace GridKit
5757
GridKit::Enzyme::Sparse::DhDwb<GridKit::PhasorDynamics::Branch<ScalarT, IdxT>,
5858
GridKit::Enzyme::Sparse::MemberFunctions::BusResidual22>::eval(this,
5959
static_cast<size_t>(bus2_->size()),
60-
static_cast<size_t>((bus2_->y()).size()),
60+
static_cast<size_t>((bus2_->y()).getSize()),
6161
(bus2_->getResidualIndices()).data(),
6262
(bus2_->getVariableIndices()).data(),
6363
y_.getData(),
@@ -72,7 +72,7 @@ namespace GridKit
7272
GridKit::Enzyme::Sparse::DhDwb<GridKit::PhasorDynamics::Branch<ScalarT, IdxT>,
7373
GridKit::Enzyme::Sparse::MemberFunctions::BusResidual12>::eval(this,
7474
static_cast<size_t>(bus1_->size()),
75-
static_cast<size_t>((bus2_->y()).size()),
75+
static_cast<size_t>((bus2_->y()).getSize()),
7676
(bus1_->getResidualIndices()).data(),
7777
(bus2_->getVariableIndices()).data(),
7878
y_.getData(),
@@ -87,7 +87,7 @@ namespace GridKit
8787
GridKit::Enzyme::Sparse::DhDwb<GridKit::PhasorDynamics::Branch<ScalarT, IdxT>,
8888
GridKit::Enzyme::Sparse::MemberFunctions::BusResidual21>::eval(this,
8989
static_cast<size_t>(bus2_->size()),
90-
static_cast<size_t>((bus1_->y()).size()),
90+
static_cast<size_t>((bus1_->y()).getSize()),
9191
(bus2_->getResidualIndices()).data(),
9292
(bus1_->getVariableIndices()).data(),
9393
y_.getData(),

‎GridKit/Model/PhasorDynamics/Branch/BranchImpl.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ namespace GridKit
125125
}
126126
auto size = static_cast<std::size_t>(size_);
127127

128-
assert(y_.size() == size);
129-
assert(yp_.size() == size);
130-
assert(f_.size() == size);
131-
assert(this->tag_.size() == size);
132-
assert(this->abs_tol_.size() == size);
128+
assert(y_.getSize() == size);
129+
assert(yp_.getSize() == size);
130+
assert(f_.getSize() == size);
131+
assert(this->tag_.getSize() == size);
132+
assert(this->abs_tol_.getSize() == size);
133133

134134
variable_indices_.resize(size);
135135
residual_indices_.resize(size);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ namespace GridKit
112112
}
113113
size_t size = static_cast<size_t>(size_);
114114

115-
assert(y_.size() == size);
116-
assert(yp_.size() == size);
117-
assert(f_.size() == size);
118-
assert(tag_.size() == size);
119-
assert(abs_tol_.size() == size);
115+
assert(y_.getSize() == size);
116+
assert(yp_.getSize() == size);
117+
assert(f_.getSize() == size);
118+
assert(tag_.getSize() == size);
119+
assert(abs_tol_.getSize() == size);
120120

121121
variable_indices_.resize(size);
122122
residual_indices_.resize(size);
@@ -167,7 +167,7 @@ namespace GridKit
167167
template <typename scalar_type, typename index_type>
168168
int Bus<scalar_type, index_type>::setAbsoluteTolerance(RealT rel_tol)
169169
{
170-
std::fill(abs_tol_.getData(), abs_tol_.getData() + abs_tol_.size(), rel_tol);
170+
std::fill(abs_tol_.getData(), abs_tol_.getData() + abs_tol_.getSize(), rel_tol);
171171
return 0;
172172
}
173173

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ namespace GridKit
110110
}
111111
auto size = static_cast<std::size_t>(size_);
112112

113-
assert(y_.size() == size);
114-
assert(yp_.size() == size);
115-
assert(f_.size() == size);
116-
assert(this->tag_.size() == size);
117-
assert(this->abs_tol_.size() == size);
113+
assert(y_.getSize() == size);
114+
assert(yp_.getSize() == size);
115+
assert(f_.getSize() == size);
116+
assert(this->tag_.getSize() == size);
117+
assert(this->abs_tol_.getSize() == size);
118118

119119
variable_indices_.resize(size);
120120
residual_indices_.resize(size);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ namespace GridKit
4040

4141
GridKit::Enzyme::Sparse::DfDy<GridKit::PhasorDynamics::BusFault<ScalarT, IdxT>,
4242
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidual>::eval(this,
43-
f_.size(),
44-
y_.size(),
43+
static_cast<size_t>(f_.getSize()),
44+
static_cast<size_t>(y_.getSize()),
4545
(this->getResidualIndices()).data(),
4646
(this->getVariableIndices()).data(),
4747
y_.getData(),
@@ -55,7 +55,7 @@ namespace GridKit
5555
IdxT nnz_tmp = nnz_;
5656
GridKit::Enzyme::Sparse::DfDwb<GridKit::PhasorDynamics::BusFault<ScalarT, IdxT>,
5757
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidual>::eval(this,
58-
f_.size(),
58+
static_cast<size_t>(f_.getSize()),
5959
static_cast<size_t>(bus_->size()),
6060
(this->getResidualIndices()).data(),
6161
(bus_->getVariableIndices()).data(),
@@ -77,7 +77,7 @@ namespace GridKit
7777
GridKit::Enzyme::Sparse::DhDy<GridKit::PhasorDynamics::BusFault<ScalarT, IdxT>,
7878
GridKit::Enzyme::Sparse::MemberFunctions::BusResidual>::eval(this,
7979
static_cast<size_t>(bus_->size()),
80-
y_.size(),
80+
static_cast<size_t>(y_.getSize()),
8181
(bus_->getResidualIndices()).data(),
8282
(this->getVariableIndices()).data(),
8383
y_.getData(),

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ namespace GridKit
124124
// std::cout << "Allocate BusFault..." << std::endl;
125125
auto size = static_cast<std::size_t>(size_);
126126

127-
assert(y_.size() == size);
128-
assert(yp_.size() == size);
129-
assert(this->f_.size() == size);
130-
assert(tag_.size() == size);
131-
assert(this->abs_tol_.size() == size);
127+
assert(y_.getSize() == size);
128+
assert(yp_.getSize() == size);
129+
assert(this->f_.getSize() == size);
130+
assert(tag_.getSize() == size);
131+
assert(this->abs_tol_.getSize() == size);
132132

133133
this->variable_indices_.resize(size);
134134
this->residual_indices_.resize(size);
@@ -207,7 +207,7 @@ namespace GridKit
207207
template <class scalar_type, typename index_type>
208208
int BusFault<scalar_type, index_type>::setAbsoluteTolerance(RealT rel_tol)
209209
{
210-
std::fill(abs_tol_.getData(), abs_tol_.getData() + abs_tol_.size(), rel_tol);
210+
std::fill(abs_tol_.getData(), abs_tol_.getData() + abs_tol_.getSize(), rel_tol);
211211
return 0;
212212
}
213213

‎GridKit/Model/PhasorDynamics/BusToSignalAdapter/BusToSignalAdapterImpl.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ namespace GridKit
5858
}
5959
auto size = static_cast<std::size_t>(size_);
6060

61-
assert(this->y_.size() == size);
62-
assert(this->yp_.size() == size);
63-
assert(this->f_.size() == size);
64-
assert(this->tag_.size() == size);
65-
assert(this->abs_tol_.size() == size);
61+
assert(this->y_.getSize() == size);
62+
assert(this->yp_.getSize() == size);
63+
assert(this->f_.getSize() == size);
64+
assert(this->tag_.getSize() == size);
65+
assert(this->abs_tol_.getSize() == size);
6666

6767
this->variable_indices_.resize(size);
6868
this->residual_indices_.resize(size);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ namespace GridKit
4343

4444
GridKit::Enzyme::Sparse::DfDy<GridKit::PhasorDynamics::Exciter::Ieeet1<ScalarT, IdxT>,
4545
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidualWithSignal>::eval(this,
46-
f_.size(),
47-
y_.size(),
46+
static_cast<size_t>(f_.getSize()),
47+
static_cast<size_t>(y_.getSize()),
4848
(this->getResidualIndices()).data(),
4949
(this->getVariableIndices()).data(),
5050
y_.getData(),
@@ -58,8 +58,8 @@ namespace GridKit
5858

5959
GridKit::Enzyme::Sparse::DfDyp<GridKit::PhasorDynamics::Exciter::Ieeet1<ScalarT, IdxT>,
6060
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidualWithSignal>::eval(this,
61-
f_.size(),
62-
y_.size(),
61+
static_cast<size_t>(f_.getSize()),
62+
static_cast<size_t>(y_.getSize()),
6363
(this->getResidualIndices()).data(),
6464
(this->getVariableIndices()).data(),
6565
y_.getData(),
@@ -74,7 +74,7 @@ namespace GridKit
7474

7575
GridKit::Enzyme::Sparse::DfDwb<GridKit::PhasorDynamics::Exciter::Ieeet1<ScalarT, IdxT>,
7676
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidualWithSignal>::eval(this,
77-
f_.size(),
77+
static_cast<size_t>(f_.getSize()),
7878
static_cast<size_t>(bus_->size()),
7979
(this->getResidualIndices()).data(),
8080
(bus_->getVariableIndices()).data(),
@@ -89,7 +89,7 @@ namespace GridKit
8989

9090
GridKit::Enzyme::Sparse::DfDws<GridKit::PhasorDynamics::Exciter::Ieeet1<ScalarT, IdxT>,
9191
GridKit::Enzyme::Sparse::MemberFunctions::InternalResidualWithSignal>::eval(this,
92-
f_.size(),
92+
static_cast<size_t>(f_.getSize()),
9393
ws_.size(),
9494
(this->getResidualIndices()).data(),
9595
ws_indices_.data(),

0 commit comments

Comments
 (0)