Skip to content

Commit d2636cc

Browse files
lukelowrylukelowry
committed
fix namespace references from rebase
1 parent f9451be commit d2636cc

6 files changed

Lines changed: 46 additions & 45 deletions

File tree

‎GridKit/Model/Evaluator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace GridKit
1313
{
1414
namespace Model
1515
{
16-
namespace memory = GridKit::LinearAlgebra::memory;
16+
namespace memory = GridKit::memory;
1717

1818
/*!
1919
* @brief Abstract class describing a model.

‎GridKit/Model/PowerElectronics/SystemModelPowerElectronics.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ namespace GridKit
357357

358358
int tagDifferentiable() final
359359
{
360+
std::fill(tag_.data(), tag_.data() + tag_.size(), ScalarT{0.0});
360361
return 0;
361362
}
362363

‎GridKit/Model/PowerFlow/Bus/BusPQ.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,16 @@ namespace GridKit
7575
this->allocateVectors(size_);
7676

7777
fB_ = VectorT(size_);
78-
fB_.allocate(GridKit::LinearAlgebra::memory::HOST);
79-
fB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
78+
fB_.allocate(GridKit::memory::HOST);
79+
fB_.setDataUpdated(GridKit::memory::HOST);
8080

8181
yB_ = VectorT(size_);
82-
yB_.allocate(GridKit::LinearAlgebra::memory::HOST);
83-
yB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
82+
yB_.allocate(GridKit::memory::HOST);
83+
yB_.setDataUpdated(GridKit::memory::HOST);
8484

8585
ypB_ = VectorT(size_);
86-
ypB_.allocate(GridKit::LinearAlgebra::memory::HOST);
87-
ypB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
86+
ypB_.allocate(GridKit::memory::HOST);
87+
ypB_.setDataUpdated(GridKit::memory::HOST);
8888

8989
return 0;
9090
}

‎GridKit/Model/PowerFlow/Bus/BusPV.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ namespace GridKit
7373
this->allocateVectors(size_);
7474

7575
fB_ = VectorT(size_);
76-
fB_.allocate(GridKit::LinearAlgebra::memory::HOST);
77-
fB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
76+
fB_.allocate(GridKit::memory::HOST);
77+
fB_.setDataUpdated(GridKit::memory::HOST);
7878

7979
yB_ = VectorT(size_);
80-
yB_.allocate(GridKit::LinearAlgebra::memory::HOST);
81-
yB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
80+
yB_.allocate(GridKit::memory::HOST);
81+
yB_.setDataUpdated(GridKit::memory::HOST);
8282

8383
ypB_ = VectorT(size_);
84-
ypB_.allocate(GridKit::LinearAlgebra::memory::HOST);
85-
ypB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
84+
ypB_.allocate(GridKit::memory::HOST);
85+
ypB_.setDataUpdated(GridKit::memory::HOST);
8686

8787
return 0;
8888
}

‎GridKit/Model/PowerFlow/ModelEvaluatorImpl.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,29 @@ namespace GridKit
5050
{
5151
allocateVectors(size_);
5252

53-
g_.allocate(GridKit::LinearAlgebra::memory::HOST);
54-
g_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
53+
g_.allocate(GridKit::memory::HOST);
54+
g_.setDataUpdated(GridKit::memory::HOST);
5555

56-
yB_.allocate(GridKit::LinearAlgebra::memory::HOST);
57-
yB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
56+
yB_.allocate(GridKit::memory::HOST);
57+
yB_.setDataUpdated(GridKit::memory::HOST);
5858

59-
ypB_.allocate(GridKit::LinearAlgebra::memory::HOST);
60-
ypB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
59+
ypB_.allocate(GridKit::memory::HOST);
60+
ypB_.setDataUpdated(GridKit::memory::HOST);
6161

62-
fB_.allocate(GridKit::LinearAlgebra::memory::HOST);
63-
fB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
62+
fB_.allocate(GridKit::memory::HOST);
63+
fB_.setDataUpdated(GridKit::memory::HOST);
6464

65-
gB_.allocate(GridKit::LinearAlgebra::memory::HOST);
66-
gB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
65+
gB_.allocate(GridKit::memory::HOST);
66+
gB_.setDataUpdated(GridKit::memory::HOST);
6767

68-
param_.allocate(GridKit::LinearAlgebra::memory::HOST);
69-
param_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
68+
param_.allocate(GridKit::memory::HOST);
69+
param_.setDataUpdated(GridKit::memory::HOST);
7070

71-
param_up_.allocate(GridKit::LinearAlgebra::memory::HOST);
72-
param_up_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
71+
param_up_.allocate(GridKit::memory::HOST);
72+
param_up_.setDataUpdated(GridKit::memory::HOST);
7373

74-
param_lo_.allocate(GridKit::LinearAlgebra::memory::HOST);
75-
param_lo_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
74+
param_lo_.allocate(GridKit::memory::HOST);
75+
param_lo_.setDataUpdated(GridKit::memory::HOST);
7676
}
7777

7878
virtual IdxT size()

‎GridKit/Model/PowerFlow/SystemModel.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,36 +105,36 @@ namespace GridKit
105105
this->allocateVectors(size_);
106106

107107
yB_ = VectorT(size_);
108-
yB_.allocate(GridKit::LinearAlgebra::memory::HOST);
109-
yB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
108+
yB_.allocate(GridKit::memory::HOST);
109+
yB_.setDataUpdated(GridKit::memory::HOST);
110110

111111
ypB_ = VectorT(size_);
112-
ypB_.allocate(GridKit::LinearAlgebra::memory::HOST);
113-
ypB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
112+
ypB_.allocate(GridKit::memory::HOST);
113+
ypB_.setDataUpdated(GridKit::memory::HOST);
114114

115115
fB_ = VectorT(size_);
116-
fB_.allocate(GridKit::LinearAlgebra::memory::HOST);
117-
fB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
116+
fB_.allocate(GridKit::memory::HOST);
117+
fB_.setDataUpdated(GridKit::memory::HOST);
118118

119119
g_ = VectorT(size_quad_);
120-
g_.allocate(GridKit::LinearAlgebra::memory::HOST);
121-
g_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
120+
g_.allocate(GridKit::memory::HOST);
121+
g_.setDataUpdated(GridKit::memory::HOST);
122122

123123
gB_ = VectorT(size_quad_ * size_opt_);
124-
gB_.allocate(GridKit::LinearAlgebra::memory::HOST);
125-
gB_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
124+
gB_.allocate(GridKit::memory::HOST);
125+
gB_.setDataUpdated(GridKit::memory::HOST);
126126

127127
param_ = VectorT(size_opt_);
128-
param_.allocate(GridKit::LinearAlgebra::memory::HOST);
129-
param_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
128+
param_.allocate(GridKit::memory::HOST);
129+
param_.setDataUpdated(GridKit::memory::HOST);
130130

131131
param_lo_ = VectorT(size_opt_);
132-
param_lo_.allocate(GridKit::LinearAlgebra::memory::HOST);
133-
param_lo_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
132+
param_lo_.allocate(GridKit::memory::HOST);
133+
param_lo_.setDataUpdated(GridKit::memory::HOST);
134134

135135
param_up_ = VectorT(size_opt_);
136-
param_up_.allocate(GridKit::LinearAlgebra::memory::HOST);
137-
param_up_.setDataUpdated(GridKit::LinearAlgebra::memory::HOST);
136+
param_up_.allocate(GridKit::memory::HOST);
137+
param_up_.setDataUpdated(GridKit::memory::HOST);
138138

139139
assert(size_quad_ == 1 or size_quad_ == 0);
140140

0 commit comments

Comments
 (0)