Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
Power System Simulation and Optimization
DPsim
DPsim
Commits
b3675b1f
Commit
b3675b1f
authored
Mar 14, 2020
by
Markus Mirz
Browse files
rename SignalComponent class
parent
a365fc76
Changes
11
Hide whitespace changes
Inline
Side-by-side
Dependencies/libcps/Include/cps/Signal/DecouplingLine.h
View file @
b3675b1f
...
...
@@ -30,7 +30,7 @@
namespace
CPS
{
namespace
Signal
{
class
DecouplingLine
:
public
SignalComp
onent
,
public
Sim
SignalComp
,
public
SharedFactory
<
DecouplingLine
>
{
protected:
Real
mDelay
;
...
...
Dependencies/libcps/Include/cps/Signal/DecouplingLineEMT.h
View file @
b3675b1f
...
...
@@ -29,7 +29,7 @@
namespace
CPS
{
namespace
Signal
{
class
DecouplingLineEMT
:
public
SignalComp
onent
,
public
Sim
SignalComp
,
public
SharedFactory
<
DecouplingLineEMT
>
{
protected:
Real
mDelay
;
...
...
Dependencies/libcps/Include/cps/Signal/FIRFilter.h
View file @
b3675b1f
...
...
@@ -31,7 +31,7 @@
namespace
CPS
{
namespace
Signal
{
class
FIRFilter
:
public
SignalComp
onent
,
public
Sim
SignalComp
,
public
SharedFactory
<
FIRFilter
>
{
protected:
std
::
vector
<
Real
>
mSignal
;
...
...
Dependencies/libcps/Include/cps/SimSignalComp.h
View file @
b3675b1f
...
...
@@ -25,7 +25,7 @@
namespace
CPS
{
/// Base class for all signal type components
/// that have only unidirectional connections
class
SignalComp
onent
:
public
TopologicalSignalComp
{
class
Sim
SignalComp
:
public
TopologicalSignalComp
{
public:
enum
Behaviour
{
Initialization
,
Simulation
};
protected:
...
...
@@ -33,17 +33,17 @@ namespace CPS {
/// special behavior for components during initialization
Bool
mBehaviour
=
Behaviour
::
Simulation
;
public:
typedef
std
::
shared_ptr
<
SignalComp
onent
>
Ptr
;
typedef
std
::
shared_ptr
<
Sim
SignalComp
>
Ptr
;
typedef
std
::
vector
<
Ptr
>
List
;
///
SignalComp
onent
(
String
uid
,
String
name
,
Logger
::
Level
logLevel
=
Logger
::
Level
::
off
)
Sim
SignalComp
(
String
uid
,
String
name
,
Logger
::
Level
logLevel
=
Logger
::
Level
::
off
)
:
TopologicalSignalComp
(
uid
,
name
,
logLevel
)
{
}
///
SignalComp
onent
(
String
name
,
Logger
::
Level
logLevel
=
Logger
::
Level
::
off
)
:
SignalComp
onent
(
name
,
name
,
logLevel
)
{
}
Sim
SignalComp
(
String
name
,
Logger
::
Level
logLevel
=
Logger
::
Level
::
off
)
:
Sim
SignalComp
(
name
,
name
,
logLevel
)
{
}
///
virtual
~
SignalComp
onent
()
{
}
virtual
~
Sim
SignalComp
()
{
}
///
virtual
void
initialize
(
Real
timeStep
)
{
}
...
...
Dependencies/libcps/Source/Signal/DecouplingLine.cpp
View file @
b3675b1f
...
...
@@ -25,7 +25,7 @@ using namespace CPS::Signal;
DecouplingLine
::
DecouplingLine
(
String
name
,
Node
<
Complex
>::
Ptr
node1
,
Node
<
Complex
>::
Ptr
node2
,
Real
resistance
,
Real
inductance
,
Real
capacitance
,
Logger
::
Level
logLevel
)
:
SignalComp
onent
(
name
,
name
,
logLevel
),
Sim
SignalComp
(
name
,
name
,
logLevel
),
mResistance
(
resistance
),
mInductance
(
inductance
),
mCapacitance
(
capacitance
)
{
addAttribute
<
Matrix
>
(
"states"
,
&
mStates
);
...
...
@@ -55,7 +55,7 @@ DecouplingLine::DecouplingLine(String name, Node<Complex>::Ptr node1, Node<Compl
}
DecouplingLine
::
DecouplingLine
(
String
name
,
Logger
::
Level
logLevel
)
:
SignalComp
onent
(
name
,
name
,
logLevel
)
{
Sim
SignalComp
(
name
,
name
,
logLevel
)
{
addAttribute
<
Matrix
>
(
"states"
,
&
mStates
);
addAttribute
<
Complex
>
(
"i_src1"
,
&
mSrcCur1Ref
,
Flags
::
read
);
...
...
Dependencies/libcps/Source/Signal/DecouplingLineEMT.cpp
View file @
b3675b1f
...
...
@@ -24,7 +24,7 @@ using namespace CPS::EMT::Ph1;
using
namespace
CPS
::
Signal
;
DecouplingLineEMT
::
DecouplingLineEMT
(
String
name
,
Logger
::
Level
logLevel
)
:
SignalComp
onent
(
name
,
name
,
logLevel
)
{
Sim
SignalComp
(
name
,
name
,
logLevel
)
{
addAttribute
<
Matrix
>
(
"states"
,
&
mStates
);
addAttribute
<
Real
>
(
"i_src1"
,
&
mSrcCur1Ref
,
Flags
::
read
);
...
...
Dependencies/libcps/Source/Signal/FIRFilter.cpp
View file @
b3675b1f
...
...
@@ -26,7 +26,7 @@ using namespace CPS;
using
namespace
CPS
::
Signal
;
FIRFilter
::
FIRFilter
(
String
uid
,
String
name
,
Logger
::
Level
logLevel
)
:
SignalComp
onent
(
name
,
name
,
logLevel
),
Sim
SignalComp
(
name
,
name
,
logLevel
),
mCurrentIdx
(
0
),
mInitSample
(
0.0
)
{
...
...
Include/dpsim/DiakopticsSolver.h
View file @
b3675b1f
...
...
@@ -70,7 +70,7 @@ namespace DPsim {
std
::
vector
<
Subnet
>
mSubnets
;
std
::
unordered_map
<
typename
CPS
::
Node
<
VarType
>::
Ptr
,
Subnet
*>
mNodeSubnetMap
;
typename
CPS
::
PowerComponent
<
VarType
>::
List
mTearComponents
;
CPS
::
SignalComp
onent
::
List
mSignalComp
onent
s
;
CPS
::
Sim
SignalComp
::
List
mSi
mSignalComps
;
Matrix
mRightSideVector
;
Matrix
mLeftSideVector
;
...
...
Include/dpsim/MNASolver.h
View file @
b3675b1f
...
...
@@ -69,7 +69,7 @@ namespace DPsim {
///
CPS
::
MNASwitchInterface
::
List
mSwitches
;
///
CPS
::
SignalComp
onent
::
List
mSignalComp
onent
s
;
CPS
::
Sim
SignalComp
::
List
mSi
mSignalComps
;
// #### MNA specific attributes ####
/// System matrix A that is modified by matrix stamps
...
...
@@ -110,7 +110,7 @@ namespace DPsim {
void
initializeComponents
();
/// Initialization of system matrices and source vector
void
initializeSystem
();
/// Identify Nodes and PowerComponents and SignalComp
onent
s
/// Identify Nodes and PowerComponents and
Sim
SignalComps
void
identifyTopologyObjects
();
/// Assign simulation node index according to index in the vector.
void
assignSimNodes
();
...
...
Source/DiakopticsSolver.cpp
View file @
b3675b1f
...
...
@@ -83,9 +83,9 @@ void DiakopticsSolver<VarType>::initSubnets(const std::vector<SystemTopology>& s
if
(
mnaComp
)
mSubnets
[
i
].
components
.
push_back
(
mnaComp
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
SignalComp
onent
>
(
comp
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
Sim
SignalComp
>
(
comp
);
if
(
sigComp
)
mSignalComp
onent
s
.
push_back
(
sigComp
);
mSi
mSignalComps
.
push_back
(
sigComp
);
}
}
...
...
@@ -274,7 +274,7 @@ void DiakopticsSolver<VarType>::initComponents() {
}
}
// Initialize signal components.
for
(
auto
comp
:
mSignalComp
onent
s
)
for
(
auto
comp
:
mSi
mSignalComps
)
comp
->
initialize
(
mSystem
.
mSystemOmega
,
mTimeStep
);
}
...
...
@@ -366,7 +366,7 @@ Task::List DiakopticsSolver<VarType>::getTasks() {
l
.
push_back
(
std
::
make_shared
<
SolveTask
>
(
*
this
,
net
));
}
for
(
auto
comp
:
mSignalComp
onent
s
)
{
for
(
auto
comp
:
mSi
mSignalComps
)
{
for
(
auto
task
:
comp
->
getTasks
())
{
l
.
push_back
(
task
);
}
...
...
Source/MNASolver.cpp
View file @
b3675b1f
...
...
@@ -87,8 +87,8 @@ void MnaSolver<VarType>::initialize() {
auto
powerComp
=
std
::
dynamic_pointer_cast
<
CPS
::
TopologicalComponent
>
(
comp
);
if
(
powerComp
)
powerComp
->
setBehaviour
(
TopologicalComponent
::
Behaviour
::
Simulation
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
SignalComp
onent
>
(
comp
);
if
(
sigComp
)
sigComp
->
setBehaviour
(
SignalComp
onent
::
Behaviour
::
Simulation
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
Sim
SignalComp
>
(
comp
);
if
(
sigComp
)
sigComp
->
setBehaviour
(
Sim
SignalComp
::
Behaviour
::
Simulation
);
}
// Initialize system matrices and source vector.
...
...
@@ -111,7 +111,7 @@ void MnaSolver<Real>::initializeComponents() {
}
// Initialize signal components.
for
(
auto
comp
:
mSignalComp
onent
s
)
for
(
auto
comp
:
mSi
mSignalComps
)
comp
->
initialize
(
mSystem
.
mSystemOmega
,
mTimeStep
);
// Initialize MNA specific parts of components.
...
...
@@ -138,7 +138,7 @@ void MnaSolver<Complex>::initializeComponents() {
}
// Initialize signal components.
for
(
auto
comp
:
mSignalComp
onent
s
)
for
(
auto
comp
:
mSi
mSignalComps
)
comp
->
initialize
(
mSystem
.
mSystemOmega
,
mTimeStep
);
mSLog
->
info
(
"-- Initialize MNA properties of components"
);
...
...
@@ -263,8 +263,8 @@ void MnaSolver<VarType>::identifyTopologyObjects() {
auto
mnaComp
=
std
::
dynamic_pointer_cast
<
CPS
::
MNAInterface
>
(
comp
);
if
(
mnaComp
)
mMNAComponents
.
push_back
(
mnaComp
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
SignalComp
onent
>
(
comp
);
if
(
sigComp
)
mSignalComp
onent
s
.
push_back
(
sigComp
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
Sim
SignalComp
>
(
comp
);
if
(
sigComp
)
mSi
mSignalComps
.
push_back
(
sigComp
);
}
}
...
...
@@ -397,8 +397,8 @@ void MnaSolver<VarType>::steadyStateInitialization() {
auto
powerComp
=
std
::
dynamic_pointer_cast
<
CPS
::
TopologicalComponent
>
(
comp
);
if
(
powerComp
)
powerComp
->
setBehaviour
(
TopologicalComponent
::
Behaviour
::
Initialization
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
SignalComp
onent
>
(
comp
);
if
(
sigComp
)
sigComp
->
setBehaviour
(
SignalComp
onent
::
Behaviour
::
Initialization
);
auto
sigComp
=
std
::
dynamic_pointer_cast
<
CPS
::
Sim
SignalComp
>
(
comp
);
if
(
sigComp
)
sigComp
->
setBehaviour
(
Sim
SignalComp
::
Behaviour
::
Initialization
);
}
initializeSystem
();
...
...
@@ -421,7 +421,7 @@ void MnaSolver<VarType>::steadyStateInitialization() {
}
}
// TODO signal components should be moved out of MNA solver
for
(
auto
comp
:
mSignalComp
onent
s
)
{
for
(
auto
comp
:
mSi
mSignalComps
)
{
for
(
auto
task
:
comp
->
getTasks
())
{
tasks
.
push_back
(
task
);
}
...
...
@@ -482,7 +482,7 @@ Task::List MnaSolver<VarType>::getTasks() {
l
.
push_back
(
task
);
}
// TODO signal components should be moved out of MNA solver
for
(
auto
comp
:
mSignalComp
onent
s
)
{
for
(
auto
comp
:
mSi
mSignalComps
)
{
for
(
auto
task
:
comp
->
getTasks
())
{
l
.
push_back
(
task
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment