Skip to content

Commit f33d600

Browse files
peleshpelesh
authored
Rename namespace ModelLib -> GridKit. (#56)
1 parent 88cecaa commit f33d600

File tree

81 files changed

+178
-178
lines changed

Some content is hidden

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

81 files changed

+178
-178
lines changed

‎examples/AdjointSensitivity/AdjointSensitivity.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
*/
8080
int main()
8181
{
82-
using namespace ModelLib;
82+
using namespace GridKit;
8383
using namespace AnalysisManager::Sundials;
8484
using namespace AnalysisManager;
8585
using namespace GridKit::Testing;

‎examples/DistributedGeneratorTest/DGTest.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
int main(int argc, char const *argv[])
2121
{
2222

23-
ModelLib::DistributedGeneratorParameters<double, size_t> parms;
23+
GridKit::DistributedGeneratorParameters<double, size_t> parms;
2424
//Parameters from MATLAB Microgrid code for first DG
2525
parms.wb_ = 2.0*M_PI*50.0;
2626
parms.wc_ = 31.41;
@@ -38,7 +38,7 @@ int main(int argc, char const *argv[])
3838
parms.rLc_ = 0.03;
3939
parms.Lc_ = 0.35e-3;
4040

41-
ModelLib::DistributedGenerator<double, size_t> *dg = new ModelLib::DistributedGenerator<double, size_t>(0, parms, true);
41+
GridKit::DistributedGenerator<double, size_t> *dg = new GridKit::DistributedGenerator<double, size_t>(0, parms, true);
4242

4343
std::vector<double> t1(16,0.0);
4444
std::vector<double> t2{0.0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5};

‎examples/DynamicConstrainedOpt/DynamicConstrainedOpt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
int main()
7676
{
77-
using namespace ModelLib;
77+
using namespace GridKit;
7878
using namespace AnalysisManager::Sundials;
7979
using namespace AnalysisManager;
8080
using namespace GridKit::Testing;

‎examples/GenConstLoad/GenConstLoad.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
int main()
7777
{
78-
using namespace ModelLib;
78+
using namespace GridKit;
7979
using namespace AnalysisManager::Sundials;
8080
using namespace AnalysisManager;
8181
using namespace GridKit::Testing;

‎examples/GenInfiniteBus/GenInfiniteBus.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
int main()
7777
{
78-
using namespace ModelLib;
78+
using namespace GridKit;
7979
using namespace AnalysisManager::Sundials;
8080
using namespace AnalysisManager;
8181
using namespace GridKit::Testing;

‎examples/Grid3Bus/Grid3BusSys.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ mpc.gencost = [
134134
)";
135135

136136

137-
using namespace ModelLib;
137+
using namespace GridKit;
138138
using namespace AnalysisManager::Sundials;
139139
using namespace AnalysisManager;
140140
using namespace GridKit::Testing;

‎examples/Microgrid/Microgrid.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ int main(int argc, char const *argv[])
2727
bool usejac = true;
2828

2929
//Create model
30-
ModelLib::PowerElectronicsModel<double, size_t>* sysmodel = new ModelLib::PowerElectronicsModel<double, size_t>(reltol, abstol, usejac, max_step_amount);
30+
GridKit::PowerElectronicsModel<double, size_t>* sysmodel = new GridKit::PowerElectronicsModel<double, size_t>(reltol, abstol, usejac, max_step_amount);
3131

3232
//Modeled after the problem in the paper
3333
double RN = 1.0e4;
3434

3535
//DG Params
36-
ModelLib::DistributedGeneratorParameters<double, size_t> parms1;
36+
GridKit::DistributedGeneratorParameters<double, size_t> parms1;
3737
parms1.wb_ = 2.0*M_PI*50.0;
3838
parms1.wc_ = 31.41;
3939
parms1.mp_ = 9.4e-5;
@@ -50,7 +50,7 @@ int main(int argc, char const *argv[])
5050
parms1.rLc_ = 0.03;
5151
parms1.Lc_ = 0.35e-3;
5252

53-
ModelLib::DistributedGeneratorParameters<double, size_t> parms2;
53+
GridKit::DistributedGeneratorParameters<double, size_t> parms2;
5454
//Parameters from MATLAB Microgrid code for first DG
5555
parms2.wb_ = 2.0*M_PI*50.0;
5656
parms2.wc_ = 31.41;
@@ -103,7 +103,7 @@ int main(int argc, char const *argv[])
103103
size_t indexv = 0;
104104

105105
//dg 1
106-
ModelLib::DistributedGenerator<double, size_t> *dg1 = new ModelLib::DistributedGenerator<double, size_t>(0, parms1, true);
106+
GridKit::DistributedGenerator<double, size_t> *dg1 = new GridKit::DistributedGenerator<double, size_t>(0, parms1, true);
107107
//ref motor
108108
dg1->setExternalConnectionNodes(0,vec_size_internals);
109109
//outputs
@@ -121,7 +121,7 @@ int main(int argc, char const *argv[])
121121
sysmodel->addComponent(dg1);
122122

123123
//dg 2
124-
ModelLib::DistributedGenerator<double, size_t> *dg2 = new ModelLib::DistributedGenerator<double, size_t>(1, parms1, false);
124+
GridKit::DistributedGenerator<double, size_t> *dg2 = new GridKit::DistributedGenerator<double, size_t>(1, parms1, false);
125125
//ref motor
126126
dg2->setExternalConnectionNodes(0,vec_size_internals);
127127
//outputs
@@ -138,7 +138,7 @@ int main(int argc, char const *argv[])
138138

139139

140140
//dg 3
141-
ModelLib::DistributedGenerator<double, size_t> *dg3 = new ModelLib::DistributedGenerator<double, size_t>(2, parms2, false);
141+
GridKit::DistributedGenerator<double, size_t> *dg3 = new GridKit::DistributedGenerator<double, size_t>(2, parms2, false);
142142
//ref motor
143143
dg3->setExternalConnectionNodes(0,vec_size_internals);
144144
//outputs
@@ -155,7 +155,7 @@ int main(int argc, char const *argv[])
155155

156156

157157
//dg 4
158-
ModelLib::DistributedGenerator<double, size_t> *dg4 = new ModelLib::DistributedGenerator<double, size_t>(3, parms2, false);
158+
GridKit::DistributedGenerator<double, size_t> *dg4 = new GridKit::DistributedGenerator<double, size_t>(3, parms2, false);
159159
//ref motor
160160
dg4->setExternalConnectionNodes(0,vec_size_internals);
161161
//outputs
@@ -174,7 +174,7 @@ int main(int argc, char const *argv[])
174174
// Lines
175175

176176
//line 1
177-
ModelLib::MicrogridLine<double, size_t> *l1 = new ModelLib::MicrogridLine<double, size_t>(4, rline1, Lline1);
177+
GridKit::MicrogridLine<double, size_t> *l1 = new GridKit::MicrogridLine<double, size_t>(4, rline1, Lline1);
178178
//ref motor
179179
l1->setExternalConnectionNodes(0,vec_size_internals);
180180
//input connections
@@ -194,7 +194,7 @@ int main(int argc, char const *argv[])
194194

195195

196196
//line 2
197-
ModelLib::MicrogridLine<double, size_t> *l2 = new ModelLib::MicrogridLine<double, size_t>(5, rline2, Lline2);
197+
GridKit::MicrogridLine<double, size_t> *l2 = new GridKit::MicrogridLine<double, size_t>(5, rline2, Lline2);
198198
//ref motor
199199
l2->setExternalConnectionNodes(0,vec_size_internals);
200200
//input connections
@@ -213,7 +213,7 @@ int main(int argc, char const *argv[])
213213
sysmodel->addComponent(l2);
214214

215215
//line 3
216-
ModelLib::MicrogridLine<double, size_t> *l3 = new ModelLib::MicrogridLine<double, size_t>(6, rline3, Lline3);
216+
GridKit::MicrogridLine<double, size_t> *l3 = new GridKit::MicrogridLine<double, size_t>(6, rline3, Lline3);
217217
//ref motor
218218
l3->setExternalConnectionNodes(0,vec_size_internals);
219219
//input connections
@@ -234,7 +234,7 @@ int main(int argc, char const *argv[])
234234
// loads
235235

236236
//load 1
237-
ModelLib::MicrogridLoad<double, size_t> *load1 = new ModelLib::MicrogridLoad<double, size_t>(7, rload1, Lload1);
237+
GridKit::MicrogridLoad<double, size_t> *load1 = new GridKit::MicrogridLoad<double, size_t>(7, rload1, Lload1);
238238
//ref motor
239239
load1->setExternalConnectionNodes(0,vec_size_internals);
240240
//input connections
@@ -250,7 +250,7 @@ int main(int argc, char const *argv[])
250250
sysmodel->addComponent(load1);
251251

252252
//load 2
253-
ModelLib::MicrogridLoad<double, size_t> *load2 = new ModelLib::MicrogridLoad<double, size_t>(8, rload2, Lload2);
253+
GridKit::MicrogridLoad<double, size_t> *load2 = new GridKit::MicrogridLoad<double, size_t>(8, rload2, Lload2);
254254
//ref motor
255255
load2->setExternalConnectionNodes(0,vec_size_internals);
256256
//input connections
@@ -266,25 +266,25 @@ int main(int argc, char const *argv[])
266266
sysmodel->addComponent(load2);
267267

268268
//Virtual PQ Buses
269-
ModelLib::MicrogridBusDQ<double, size_t> *bus1 = new ModelLib::MicrogridBusDQ<double, size_t>(9, RN);
269+
GridKit::MicrogridBusDQ<double, size_t> *bus1 = new GridKit::MicrogridBusDQ<double, size_t>(9, RN);
270270

271271
bus1->setExternalConnectionNodes(0,dqbus1);
272272
bus1->setExternalConnectionNodes(1,dqbus1 + 1);
273273
sysmodel->addComponent(bus1);
274274

275-
ModelLib::MicrogridBusDQ<double, size_t> *bus2 = new ModelLib::MicrogridBusDQ<double, size_t>(10, RN);
275+
GridKit::MicrogridBusDQ<double, size_t> *bus2 = new GridKit::MicrogridBusDQ<double, size_t>(10, RN);
276276

277277
bus2->setExternalConnectionNodes(0,dqbus2);
278278
bus2->setExternalConnectionNodes(1,dqbus2 + 1);
279279
sysmodel->addComponent(bus2);
280280

281-
ModelLib::MicrogridBusDQ<double, size_t> *bus3 = new ModelLib::MicrogridBusDQ<double, size_t>(11, RN);
281+
GridKit::MicrogridBusDQ<double, size_t> *bus3 = new GridKit::MicrogridBusDQ<double, size_t>(11, RN);
282282

283283
bus3->setExternalConnectionNodes(0,dqbus3);
284284
bus3->setExternalConnectionNodes(1,dqbus3 + 1);
285285
sysmodel->addComponent(bus3);
286286

287-
ModelLib::MicrogridBusDQ<double, size_t> *bus4 = new ModelLib::MicrogridBusDQ<double, size_t>(12, RN);
287+
GridKit::MicrogridBusDQ<double, size_t> *bus4 = new GridKit::MicrogridBusDQ<double, size_t>(12, RN);
288288

289289
bus4->setExternalConnectionNodes(0,dqbus4);
290290
bus4->setExternalConnectionNodes(1,dqbus4 + 1);

‎examples/ParameterEstimation/ParameterEstimation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
int main()
8282
{
83-
using namespace ModelLib;
83+
using namespace GridKit;
8484
using namespace AnalysisManager::Sundials;
8585
using namespace AnalysisManager;
8686
using namespace GridKit::Testing;

‎examples/RLCircuit/RLCircuit.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int main(int argc, char const *argv[])
2424

2525
//TODO:setup as named parameters
2626
//Create circuit model
27-
ModelLib::PowerElectronicsModel<double, size_t>* sysmodel = new ModelLib::PowerElectronicsModel<double, size_t>(reltol, abstol, usejac);
27+
GridKit::PowerElectronicsModel<double, size_t>* sysmodel = new GridKit::PowerElectronicsModel<double, size_t>(reltol, abstol, usejac);
2828

2929
size_t idoff = 0;
3030

@@ -35,7 +35,7 @@ int main(int argc, char const *argv[])
3535

3636

3737
//inductor
38-
ModelLib::Inductor<double, size_t>* induct = new ModelLib::Inductor(idoff,linit);
38+
GridKit::Inductor<double, size_t>* induct = new GridKit::Inductor(idoff,linit);
3939
//Form index to node uid realations
4040
// input
4141
induct->setExternalConnectionNodes(0,1);
@@ -49,7 +49,7 @@ int main(int argc, char const *argv[])
4949

5050
//resistor
5151
idoff++;
52-
ModelLib::Resistor<double, size_t>* resis = new ModelLib::Resistor(idoff, rinit);
52+
GridKit::Resistor<double, size_t>* resis = new GridKit::Resistor(idoff, rinit);
5353
//Form index to node uid realations
5454
//input
5555
resis->setExternalConnectionNodes(0,0);
@@ -60,7 +60,7 @@ int main(int argc, char const *argv[])
6060

6161
//voltage source
6262
idoff++;
63-
ModelLib::VoltageSource<double, size_t>* vsource = new ModelLib::VoltageSource(idoff, vinit);
63+
GridKit::VoltageSource<double, size_t>* vsource = new GridKit::VoltageSource(idoff, vinit);
6464
//Form index to node uid realations
6565
//input
6666
vsource->setExternalConnectionNodes(0,-1);

‎examples/ScaleMicrogrid/ScaleMicrogrid.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int main(int argc, char const *argv[])
6464
*/
6565
int test(index_type Nsize, real_type error_tol, bool debug_output)
6666
{
67-
using namespace ModelLib;
67+
using namespace GridKit;
6868

6969
bool usejac = true;
7070

@@ -105,7 +105,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
105105

106106
// DG Params Vector
107107
// All DGs have the same set of parameters except for the first two.
108-
ModelLib::DistributedGeneratorParameters<real_type, index_type> DG_parms1;
108+
GridKit::DistributedGeneratorParameters<real_type, index_type> DG_parms1;
109109
DG_parms1.wb_ = 2.0*M_PI*50.0;
110110
DG_parms1.wc_ = 31.41;
111111
DG_parms1.mp_ = 9.4e-5;
@@ -122,7 +122,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
122122
DG_parms1.rLc_ = 0.03;
123123
DG_parms1.Lc_ = 0.35e-3;
124124

125-
ModelLib::DistributedGeneratorParameters<real_type, index_type> DG_parms2;
125+
GridKit::DistributedGeneratorParameters<real_type, index_type> DG_parms2;
126126
DG_parms2.wb_ = 2.0*M_PI*50.0;
127127
DG_parms2.wc_ = 31.41;
128128
DG_parms2.mp_ = 12.5e-5;
@@ -139,7 +139,7 @@ int test(index_type Nsize, real_type error_tol, bool debug_output)
139139
DG_parms2.rLc_ = 0.03;
140140
DG_parms2.Lc_ = 0.35e-3;
141141

142-
std::vector<ModelLib::DistributedGeneratorParameters<real_type, index_type>> DGParams_list(2*Nsize, DG_parms2);
142+
std::vector<GridKit::DistributedGeneratorParameters<real_type, index_type>> DGParams_list(2*Nsize, DG_parms2);
143143

144144
DGParams_list[0] = DG_parms1;
145145
DGParams_list[1] = DG_parms1;

‎src/Model/PhasorDynamics/Branch/Branch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
#include "Branch.hpp"
6666

67-
namespace ModelLib { // change to GridKit
67+
namespace GridKit {
6868
namespace PhasorDynamics {
6969

7070
/*!

‎src/Model/PhasorDynamics/Branch/Branch.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ namespace PowerSystemData
7070
}
7171
}
7272

73-
namespace ModelLib
73+
namespace GridKit
7474
{
7575
namespace PhasorDynamics
7676
{
7777
template <class ScalarT, typename IdxT> class Bus;
7878
}
7979
}
8080

81-
namespace ModelLib
81+
namespace GridKit
8282
{
8383
namespace PhasorDynamics
8484
{

‎src/Model/PhasorDynamics/Bus/Bus.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#include <PowerSystemData.hpp>
6464
#include "Bus.hpp"
6565

66-
namespace ModelLib // change to GridKit
66+
namespace GridKit
6767
{
6868
namespace PhasorDynamics
6969
{
@@ -223,5 +223,5 @@ template class Bus<double, long int>;
223223
template class Bus<double, size_t>;
224224

225225
} // namespace PhasorDynamic
226-
} // namespace ModelLib
226+
} // namespace GridKit
227227

‎src/Model/PhasorDynamics/Bus/Bus.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ namespace PowerSystemData
7272
}
7373
}
7474

75-
namespace ModelLib // change to GridKit
75+
namespace GridKit
7676
{
7777
namespace PhasorDynamics
7878
{

‎src/Model/PowerElectronics/Capacitor/Capacitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <vector>
77
#include "Capacitor.hpp"
88

9-
namespace ModelLib {
9+
namespace GridKit {
1010

1111
/*!
1212
* @brief Constructor for Capacitor
@@ -141,5 +141,5 @@ template class Capacitor<double, long int>;
141141
template class Capacitor<double, size_t>;
142142

143143

144-
} //namespace ModelLib
144+
} //namespace GridKit
145145

‎src/Model/PowerElectronics/Capacitor/Capacitor.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
#include <Model/PowerElectronics/CircuitComponent.hpp>
99

1010

11-
namespace ModelLib
11+
namespace GridKit
1212
{
1313
template <class ScalarT, typename IdxT> class BaseBus;
1414
}
1515

1616

17-
namespace ModelLib
17+
namespace GridKit
1818
{
1919
/*!
2020
* @brief Declaration of a Capacitor class.

‎src/Model/PowerElectronics/CircuitComponent.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <set>
1010

1111

12-
namespace ModelLib
12+
namespace GridKit
1313
{
1414
/*!
1515
* @brief Declaration of a CircuitComponent class.

‎src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <vector>
77
#include "DistributedGenerator.hpp"
88

9-
namespace ModelLib {
9+
namespace GridKit {
1010

1111

1212
/*!
@@ -359,5 +359,5 @@ template class DistributedGenerator<double, long int>;
359359
template class DistributedGenerator<double, size_t>;
360360

361361

362-
} //namespace ModelLib
362+
} //namespace GridKit
363363

0 commit comments

Comments
 (0)