Commit d78bce04 authored by Markus Mirz's avatar Markus Mirz
Browse files

Merge branch 'multisampling' into 'master'

update syn gen load step

See merge request acs/public/simulation/dpsim!117

Former-commit-id: c9cc1e56
parents c63094b4 c86bbb42
...@@ -11,6 +11,9 @@ logs/ ...@@ -11,6 +11,9 @@ logs/
logs_*/ logs_*/
wheelhouse/ wheelhouse/
*.csv *.csv
*.pdf
*.svg
*.png
# Folders # Folders
Libraries/ Libraries/
......
...@@ -69,5 +69,10 @@ int main(int argc, char *argv[]) { ...@@ -69,5 +69,10 @@ int main(int argc, char *argv[]) {
sim.addLogger(logger); sim.addLogger(logger);
sim.run(); sim.run();
//std::ofstream ofTopo("topology_graph.svg");
//sys.topologyGraph().render(ofTopo);
//std::ofstream ofDep("task_dependencies.svg");
//sim.dependencyGraph().render(ofDep);
return 0; return 0;
} }
...@@ -73,12 +73,13 @@ void DP_SynGenDq7odTrapez_LoadStep(Real timeStep, Real finalTime, Real breakerCl ...@@ -73,12 +73,13 @@ void DP_SynGenDq7odTrapez_LoadStep(Real timeStep, Real finalTime, Real breakerCl
auto n1 = CPS::DP::Node::make("n1", PhaseType::ABC, initVoltN1); auto n1 = CPS::DP::Node::make("n1", PhaseType::ABC, initVoltN1);
// Components // Components
auto gen = CPS::DP::Ph3::SynchronGeneratorDQTrapez::make("SynGen"); auto gen = CPS::DP::Ph3::SynchronGeneratorDQTrapez::make("SynGen", CPS::Logger::Level::info);
gen->setParametersFundamentalPerUnit( gen->setParametersFundamentalPerUnit(
nomPower, nomPhPhVoltRMS, nomFreq, poleNum, nomFieldCurr, nomPower, nomPhPhVoltRMS, nomFreq, poleNum, nomFieldCurr,
Rs, Ll, Lmd, Lmq, Rfd, Llfd, Rkd, Llkd, Rkq1, Llkq1, Rkq2, Llkq2, H, Rs, Ll, Lmd, Lmq, Rfd, Llfd, Rkd, Llkd, Rkq1, Llkq1, Rkq2, Llkq2, H,
initActivePower, initReactivePower, initTerminalVolt, initActivePower, initReactivePower, initTerminalVolt,
initVoltAngle, fieldVoltage, initMechPower); initVoltAngle, fieldVoltage, initMechPower);
gen->setMultisamplingRate(1);
auto res = CPS::DP::Ph3::SeriesResistor::make("R_load", Logger::Level::info); auto res = CPS::DP::Ph3::SeriesResistor::make("R_load", Logger::Level::info);
res->setParameters(Rload); res->setParameters(Rload);
......
77960354055e49661ef52955ad345020992ac66b 2c8d300f0409ca5de25084665c39204588b9f4e2
\ No newline at end of file \ No newline at end of file
fb098a7e90b7df2a13fcfdc4978f1d63f1c7e70f afe858ad1dc9d7ec33b9174d970c9c0a524a5be2
\ No newline at end of file \ No newline at end of file
5544e325461c096bbade6e4ba00a2277713b323f 98c0350b2efbe9b68f897aa55790a8f8d6f645b8
\ No newline at end of file \ No newline at end of file
d29124ca9499ffc6f8c7d74e69d4aa65209b342f ac382373f17f9bff98f0216dc162a18d137252bc
\ No newline at end of file \ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment