Commit c9cc1e56 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
parents 099b3d9e 9faa1ae3
......@@ -11,6 +11,9 @@ logs/
logs_*/
wheelhouse/
*.csv
*.pdf
*.svg
*.png
# Folders
Libraries/
......
......@@ -69,5 +69,10 @@ int main(int argc, char *argv[]) {
sim.addLogger(logger);
sim.run();
//std::ofstream ofTopo("topology_graph.svg");
//sys.topologyGraph().render(ofTopo);
//std::ofstream ofDep("task_dependencies.svg");
//sim.dependencyGraph().render(ofDep);
return 0;
}
......@@ -73,12 +73,13 @@ void DP_SynGenDq7odTrapez_LoadStep(Real timeStep, Real finalTime, Real breakerCl
auto n1 = CPS::DP::Node::make("n1", PhaseType::ABC, initVoltN1);
// Components
auto gen = CPS::DP::Ph3::SynchronGeneratorDQTrapez::make("SynGen");
auto gen = CPS::DP::Ph3::SynchronGeneratorDQTrapez::make("SynGen", CPS::Logger::Level::info);
gen->setParametersFundamentalPerUnit(
nomPower, nomPhPhVoltRMS, nomFreq, poleNum, nomFieldCurr,
Rs, Ll, Lmd, Lmq, Rfd, Llfd, Rkd, Llkd, Rkq1, Llkq1, Rkq2, Llkq2, H,
initActivePower, initReactivePower, initTerminalVolt,
initVoltAngle, fieldVoltage, initMechPower);
gen->setMultisamplingRate(1);
auto res = CPS::DP::Ph3::SeriesResistor::make("R_load", Logger::Level::info);
res->setParameters(Rload);
......
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