diff --git a/GridKit/Solver/Dynamic/Ida.cpp b/GridKit/Solver/Dynamic/Ida.cpp index c3770193b..f2f2d5446 100644 --- a/GridKit/Solver/Dynamic/Ida.cpp +++ b/GridKit/Solver/Dynamic/Ida.cpp @@ -253,6 +253,12 @@ namespace AnalysisManager copyVec(yp_, model_->yp()); } + if (model_->monitoring()) + { + updateModelState(t0); + model_->printMonitoredVariables(); + } + return retval; } diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/Basic/ThreeBusBasic.ref.csv b/examples/PhasorDynamics/Tiny/ThreeBus/Basic/ThreeBusBasic.ref.csv index 72b3d66ea..b62e2c9df 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/Basic/ThreeBusBasic.ref.csv +++ b/examples/PhasorDynamics/Tiny/ThreeBus/Basic/ThreeBusBasic.ref.csv @@ -1,4 +1,5 @@ Time,Bus1_Vm,Bus2_Vm,Bus3_Vm,Gen1_Speed,Gen2_Speed +0.000000000e+00,1.059999943e+00,1.059997797e+00,9.699996110e-01,9.999999400e-01,9.999999400e-01 4.167000000e-03,1.059999943e+00,1.059997797e+00,9.699996110e-01,9.999999400e-01,9.999999400e-01 8.333000000e-03,1.059999943e+00,1.059997797e+00,9.699996110e-01,9.999998810e-01,9.999999400e-01 1.250000000e-02,1.059999943e+00,1.059997797e+00,9.699996110e-01,9.999998210e-01,9.999999400e-01 @@ -239,6 +240,7 @@ Time,Bus1_Vm,Bus2_Vm,Bus3_Vm,Gen1_Speed,Gen2_Speed 9.916670000e-01,1.059999943e+00,1.059996843e+00,9.699990150e-01,1.000000000e+00,1.000000000e+00 9.958330000e-01,1.059999943e+00,1.059996843e+00,9.699990150e-01,1.000000000e+00,1.000000000e+00 1.000000000e+00,1.059999943e+00,1.059996843e+00,9.699990150e-01,1.000000000e+00,1.000000000e+00 +1.000000000e+00,1.0600000000000001e+00,8.2175499708956334e-01,1.4796061535609221e-04,9.9999986320891010e-01,9.9999992810004734e-01 1.004167000e+00,1.059999943e+00,8.202927110e-01,1.473940000e-04,1.000062704e+00,1.000325799e+00 1.008333000e+00,1.059999943e+00,8.189875480e-01,1.468610000e-04,1.000121474e+00,1.000651360e+00 1.012500000e+00,1.059999943e+00,8.178158400e-01,1.463590000e-04,1.000176668e+00,1.000976920e+00 @@ -263,6 +265,7 @@ Time,Bus1_Vm,Bus2_Vm,Bus3_Vm,Gen1_Speed,Gen2_Speed 1.091667000e+00,1.059999943e+00,8.059889080e-01,1.407290000e-04,1.000807405e+00,1.007140756e+00 1.095833000e+00,1.059999943e+00,8.055638670e-01,1.405470000e-04,1.000824690e+00,1.007463932e+00 1.100000000e+00,1.059999943e+00,8.051440700e-01,1.403700000e-04,1.000840545e+00,1.007787228e+00 +1.100000000e+00,1.0600000000000001e+00,1.0304589828888600e+00,9.2020682273765619e-01,1.0008405250996919e+00,1.0077871082286076e+00 1.104167000e+00,1.059999943e+00,1.032057166e+00,9.223931430e-01,1.000855803e+00,1.007198334e+00 1.108333000e+00,1.059999943e+00,1.033476114e+00,9.244793650e-01,1.000866055e+00,1.006641626e+00 1.112500000e+00,1.059999943e+00,1.034744263e+00,9.264550210e-01,1.000872135e+00,1.006110191e+00 diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/Classical/ThreeBusClassical.ref.csv b/examples/PhasorDynamics/Tiny/ThreeBus/Classical/ThreeBusClassical.ref.csv index b4d521548..8de85d1a0 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/Classical/ThreeBusClassical.ref.csv +++ b/examples/PhasorDynamics/Tiny/ThreeBus/Classical/ThreeBusClassical.ref.csv @@ -1,4 +1,5 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed +0.0000000000000000e+00,1.0599975585937500e+00,9.6999949216842596e-01,9.9999994039535500e-01,9.9999994039535500e-01 4.1669999999999997e-03,1.0599975585937500e+00,9.6999949216842596e-01,9.9999994039535500e-01,9.9999994039535500e-01 8.3330000000000001e-03,1.0599975585937500e+00,9.6999949216842596e-01,9.9999988079071001e-01,9.9999994039535500e-01 1.2500000000000001e-02,1.0599975585937500e+00,9.6999949216842596e-01,9.9999976158142001e-01,9.9999988079071001e-01 @@ -239,6 +240,7 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed 9.9166699999999997e-01,1.0599961280822701e+00,9.6999824047088601e-01,9.9999934434890703e-01,1.0000001192092800e+00 9.9583299999999997e-01,1.0599961280822701e+00,9.6999824047088601e-01,9.9999934434890703e-01,1.0000001192092800e+00 1.0000000000000000e+00,1.0599961280822701e+00,9.6999824047088601e-01,9.9999934434890703e-01,1.0000001192092800e+00 +1.0000000000000000e+00,8.0820890883976326e-01,1.4237274299425966e-04,9.9999943367636579e-01,1.0000002392567211e+00 1.0041670000000000e+00,8.0821198225021296e-01,1.4237659343053000e-04,1.0000805854797301e+00,1.0003259181976301e+00 1.0083329999999999e+00,8.0821830034255904e-01,1.4238750736695000e-04,1.0001615285873400e+00,1.0006514787673899e+00 1.0125000000000000e+00,8.0822885036468495e-01,1.4240568270907001e-04,1.0002421140670701e+00,1.0009770393371500e+00 @@ -263,6 +265,7 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed 1.0916669999999999e+00,8.0905258655547996e-01,1.4390070282387999e-04,1.0014184713363601e+00,1.0071414709091100e+00 1.0958330000000001e+00,8.0911469459533603e-01,1.4401863154490000e-04,1.0014499425887999e+00,1.0074647665023799e+00 1.1000000000000001e+00,8.0917698144912698e-01,1.4413743338081999e-04,1.0014775991439799e+00,1.0077880620956401e+00 +1.1000000000000001e+00,1.0638700869252249e+00,9.8201874188871574e-01,1.0014780989623859e+00,1.0077881290133894e+00 1.1041669999999999e+00,1.0641010999679501e+00,9.8278427124023404e-01,1.0014476776123000e+00,1.0071539878845199e+00 1.1083330000000000e+00,1.0643062591552701e+00,9.8345637321472101e-01,1.0014162063598600e+00,1.0064736604690501e+00 1.1125000000000000e+00,1.0644885301589899e+00,9.8403912782669001e-01,1.0013828277587800e+00,1.0057513713836601e+00 diff --git a/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/ThreeBusZipLoad.ref.csv b/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/ThreeBusZipLoad.ref.csv index 977591816..4cd8f44b3 100644 --- a/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/ThreeBusZipLoad.ref.csv +++ b/examples/PhasorDynamics/Tiny/ThreeBus/ZipLoad/ThreeBusZipLoad.ref.csv @@ -1,4 +1,5 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed +0.000000000000e+00,1.059997558590e+00,9.699994325600e-01,9.999999404000e-01,9.999999404000e-01 4.167000000000e-03,1.059997558590e+00,9.699994325600e-01,9.999999404000e-01,9.999999404000e-01 8.333000000000e-03,1.059997558590e+00,9.699994325600e-01,9.999998808000e-01,9.999999404000e-01 1.250000000000e-02,1.059997558590e+00,9.699994325600e-01,9.999997616000e-01,9.999998808000e-01 @@ -239,6 +240,7 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed 9.916670000000e-01,1.059995412830e+00,9.699974656100e-01,9.999996424000e-01,9.999998212000e-01 9.958330000000e-01,1.059995293620e+00,9.699973464000e-01,9.999996424000e-01,9.999998212000e-01 1.000000000000e+00,1.059995293620e+00,9.699973464000e-01,9.999997020000e-01,9.999998808000e-01 +1.000000000000e+00,1.3615838097473282e-04,7.2207397468265599e-01,9.9999942259983921e-01,1.0000002270082260e+00 1.004167000000e+00,1.361470300000e-04,7.217242121700e-01,1.000385522800e+00,9.999070764000e-01 1.008333000000e+00,1.361501300000e-04,7.217048406600e-01,1.000771045700e+00,9.998147488000e-01 1.012500000000e+00,1.361552600000e-04,7.216726541500e-01,1.001156568500e+00,9.997231960000e-01 @@ -263,6 +265,7 @@ t,Bus_2_Vm,Bus_3_Vm,GenClassical_genrou_2_1_speed,GenClassical_genrou_3_1_speed 1.091667000000e+00,1.362818100000e-04,7.190353870400e-01,1.008452296300e+00,9.985997677000e-01 1.095833000000e+00,1.362575400000e-04,7.188273668300e-01,1.008834719700e+00,9.985910654000e-01 1.100000000000e+00,1.362255900000e-04,7.186175584800e-01,1.009217023800e+00,9.985883832000e-01 +1.100000000000e+00,1.0608261536470580e+00,9.6470689939803678e-01,1.0092167747909861e+00,9.9862170612262702e-01 1.104167000000e+00,1.060512781140e+00,9.640917182000e-01,1.008701086000e+00,9.988687038000e-01 1.108333000000e+00,1.060209274290e+00,9.636277556400e-01,1.008147597300e+00,9.991661906000e-01 1.112500000000e+00,1.059896826740e+00,9.632216692000e-01,1.007559180300e+00,9.994782805000e-01 diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.ref.csv b/examples/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.ref.csv index cbad07114..2f5b6512c 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.ref.csv +++ b/examples/PhasorDynamics/Tiny/TwoBus/Basic/TwoBusBasic.ref.csv @@ -1,4 +1,5 @@ t,Bus_Bus_1_Vm,Genrou_DV1_speed +0.0000000000000000e+00,1.0000004769999999e+00,1.0000000000000000e+00 4.1669999999999997e-03,1.0000004769999999e+00,1.0000000000000000e+00 8.3330000000000001e-03,1.0000004769999999e+00,1.0000000000000000e+00 1.2500000000000001e-02,1.0000004769999999e+00,9.9999994000000003e-01 @@ -239,6 +240,7 @@ t,Bus_Bus_1_Vm,Genrou_DV1_speed 9.9166699999999997e-01,1.0000004769999999e+00,1.0000000000000000e+00 9.9583299999999997e-01,1.0000004769999999e+00,1.0000000000000000e+00 1.0000000000000000e+00,1.0000004769999999e+00,1.0000000000000000e+00 +1.0000000000000000e+00,1.5317292455689720e-02,9.9999998210584717e-01 1.0041670000000000e+00,1.5128844000000001e-02,1.0006827119999999e+00 1.0083329999999999e+00,1.4973078000000001e-02,1.0013633970000000e+00 1.0125000000000000e+00,1.4841928000000001e-02,1.0020425319999999e+00 @@ -263,6 +265,7 @@ t,Bus_Bus_1_Vm,Genrou_DV1_speed 1.0916669999999999e+00,1.3476389000000000e-02,1.0147621630000001e+00 1.0958330000000001e+00,1.3398723000000000e-02,1.0154231789999999e+00 1.1000000000000001e+00,1.3398723000000000e-02,1.0160835980000000e+00 +1.1000000000000001e+00,8.6944052803817706e-01,1.0160834211009313e+00 1.1041669999999999e+00,8.8047874000000004e-01,1.0152623650000001e+00 1.1083330000000000e+00,8.9023459000000005e-01,1.0144935850000001e+00 1.1125000000000000e+00,8.9875972299999995e-01,1.0137621160000001e+00 diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Gensal/TwoBusGensal.ref.csv b/examples/PhasorDynamics/Tiny/TwoBus/Gensal/TwoBusGensal.ref.csv index 56a0cbde1..4ccad2b25 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Gensal/TwoBusGensal.ref.csv +++ b/examples/PhasorDynamics/Tiny/TwoBus/Gensal/TwoBusGensal.ref.csv @@ -1,4 +1,5 @@ Time,Gensal_gensal_1_1_delta,Gensal_gensal_1_1_speed,Gensal_gensal_1_1_Eqp,Gensal_gensal_1_1_psidp,Gensal_gensal_1_1_psiqpp +0,0.444230716229,1,1.007137418,0.9810884,-0.275048554 0.004167,0.444230716229,1,1.007137418,0.9810884,-0.275048554 0.008333,0.444230716229,1,1.007137418,0.9810884,-0.275048554 0.0125,0.444230716229,1,1.007137418,0.9810884,-0.275048554 @@ -239,6 +240,7 @@ Time,Gensal_gensal_1_1_delta,Gensal_gensal_1_1_speed,Gensal_gensal_1_1_Eqp,Gensa 0.991667,0.444230716229,1,1.007137418,0.9810884,-0.275048554 0.995833,0.444230716229,1,1.007137418,0.9810884,-0.275048554 1,0.444230716229,1,1.007137418,0.9810884,-0.275048554 +1,4.4423117690722169e-01,9.9999999685238095e-01,1.0071373259006151e+00,9.8108836695699186e-01,-2.7504855783187032e-01 1.004167,0.444775499113,1.00069344,1.005106807,0.96664542,-0.2310801 1.008333,0.446408682583,1.001386166,1.002991319,0.953529358,-0.194140658 1.0125,0.449130200142,1.002078533,1.000800967,0.941588104,-0.163093716 @@ -263,6 +265,7 @@ Time,Gensal_gensal_1_1_delta,Gensal_gensal_1_1_speed,Gensal_gensal_1_1_Eqp,Gensa 1.091667,0.7062021441,1.015101671,0.953391373,0.82739377,-0.006025132 1.095833,0.730451890448,1.015778542,0.95083046,0.824117541,-0.005081405 1.1,0.755770030149,1.016454458,0.948274374,0.820949852,-0.004289187 +1.1,7.5576424609185910e-01,1.0164543811900091e+00,9.4832967629962295e-01,8.2092845734689623e-01,-4.1876651424531328e-03 1.104167,0.781732122342,1.016595602,0.947741151,0.832222283,-0.025699491 1.108333,0.807904937211,1.016730666,0.947299302,0.84223032,-0.045353372 1.1125,0.834291337621,1.016859651,0.946938217,0.851120234,-0.063401252 diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/TwoBusIeeet1.ref.csv b/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/TwoBusIeeet1.ref.csv index 1e219b283..1901852a3 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/TwoBusIeeet1.ref.csv +++ b/examples/PhasorDynamics/Tiny/TwoBus/Ieeet1/TwoBusIeeet1.ref.csv @@ -1,3 +1,4 @@ +t,Bus_Bus 1_Vm,Genrou_DV1_speed,Ieeet1_DV3_efd 0.000000000000e+00,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 4.167000000000e-03,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 8.333000000000e-03,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 @@ -239,6 +240,7 @@ 9.916670000000e-01,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 9.958330000000e-01,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 1.000000000000e+00,1.000000476840e+00,1.000000000000e+00,1.914047120000e+00 +1.000000000000e+00,1.5317290273032072e-02,9.9999998676176116e-01,1.9140329550702371e+00 1.004167000000e+00,1.512884442000e-02,1.000682710000e+00,1.917918440000e+00 1.008333000000e+00,1.497309189000e-02,1.001363280000e+00,1.925662400000e+00 1.012500000000e+00,1.484197099000e-02,1.002042410000e+00,1.933411360000e+00 @@ -263,6 +265,7 @@ 1.091667000000e+00,1.348066796000e-02,1.014718290000e+00,2.081247090000e+00 1.095833000000e+00,1.340349298000e-02,1.015373230000e+00,2.089059110000e+00 1.100000000000e+00,1.332308631000e-02,1.016026970000e+00,2.096876140000e+00 +1.100000000000e+00,8.6980136857767365e-01,1.0160267455093885e+00,2.1050648110390875e+00 1.104167000000e+00,8.808438777900e-01,1.015197520000e+00,2.104696510000e+00 1.108333000000e+00,8.906207084700e-01,1.014420030000e+00,2.112518310000e+00 1.112500000000e+00,8.991688489900e-01,1.013679270000e+00,2.120345350000e+00 diff --git a/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/TwoBusTgov1.ref.csv b/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/TwoBusTgov1.ref.csv index af00eb8e7..4fccf0c2f 100644 --- a/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/TwoBusTgov1.ref.csv +++ b/examples/PhasorDynamics/Tiny/TwoBus/Tgov1/TwoBusTgov1.ref.csv @@ -1,4 +1,5 @@ t,Bus_Bus 1_Vm,Genrou_DV1_speed +0.0000000000000000e+00,1.0000004769999999e+00,1.0000000000000000e+00 4.1669999999999997e-03,1.0000004769999999e+00,1.0000000000000000e+00 8.3330000000000001e-03,1.0000004769999999e+00,1.0000000000000000e+00 1.2500000000000001e-02,1.0000004769999999e+00,9.9999994000000003e-01 @@ -239,6 +240,7 @@ t,Bus_Bus 1_Vm,Genrou_DV1_speed 9.9166699999999997e-01,1.0000004769999999e+00,1.0000000000000000e+00 9.9583299999999997e-01,1.0000004769999999e+00,1.0000000000000000e+00 1.0000000000000000e+00,1.0000004769999999e+00,1.0000000000000000e+00 +1.0000000000000000e+00,1.5317292488429128e-02,9.9999998435885695e-01 1.0041670000000000e+00,1.5128844000000001e-02,1.0006827119999999e+00 1.0083329999999999e+00,1.4973078000000001e-02,1.0013632770000001e+00 1.0125000000000000e+00,1.4841928000000001e-02,1.0020424130000001e+00 @@ -263,6 +265,7 @@ t,Bus_Bus 1_Vm,Genrou_DV1_speed 1.0916669999999999e+00,1.3477151999999999e-02,1.0147184130000000e+00 1.0958330000000001e+00,1.3399672000000000e-02,1.0153733490000001e+00 1.1000000000000001e+00,1.3318955000000000e-02,1.0160270929999999e+00 +1.1000000000000001e+00,8.6951724007150655e-01,1.0160269292515911e+00 1.1041669999999999e+00,8.8055711999999997e-01,1.0151994230000001e+00 1.1083330000000000e+00,8.9031624799999998e-01,1.0144239660000001e+00 1.1125000000000000e+00,8.9884609000000004e-01,1.0136853459999999e+00 diff --git a/tests/IntegrationTests/PhasorDynamics/PDIntegrationTests.hpp b/tests/IntegrationTests/PhasorDynamics/PDIntegrationTests.hpp index d411202b3..689107267 100644 --- a/tests/IntegrationTests/PhasorDynamics/PDIntegrationTests.hpp +++ b/tests/IntegrationTests/PhasorDynamics/PDIntegrationTests.hpp @@ -246,7 +246,7 @@ namespace GridKit ida.configureSimulation(); // Run for 1s - ida.initializeSimulation(0.0, false); + ida.initializeSimulation(0.0, true); ida.runSimulation(1.0, dt); // Introduce fault and run for the next 0.1s