Skip to content

Commit 500e6b0

Browse files
sst-autotestersst-autotester
authored
Merge pull request #1274 from sstsimulator/devel
Automatically Merged using SST Master Branch Merger
2 parents 84248f9 + 3efc088 commit 500e6b0

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

‎src/sst/core/statapi/statoutputhdf5.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ StatisticOutputHDF5::checkOutputParameters()
5656
}
5757

5858
// Get the absolute path for output file
59-
std::string filename = getAbsolutePathForOutputFile(m_FilePath);
59+
std::string filename = getAbsolutePathForOutputFile(m_filePath);
6060

6161
H5::Exception::dontPrint();
6262

‎tests/refFiles/test_StatisticsComponent_basic_h5.out‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ REGISTER CLOCK #1 at 1 ns
179179
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 24000; Sum.u64 = 0; SumSQ.u64 = 0; Count.u64 = 0; Min.u64 = 0; Max.u64 = 0;
180180
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 24000; Sum.i32 = 0; SumSQ.i32 = 0; Count.u64 = 0; Min.i32 = 0; Max.i32 = 0;
181181
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 24000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
182+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 24000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
182183
StatBasic9.stat1_U32.1 : Accumulator : SimTime = 25000; Sum.u32 = 5617; SumSQ.u32 = 1623209; Count.u64 = 25; Min.u32 = 6; Max.u32 = 414;
183184
StatBasic9.stat2_U64.2 : Accumulator : SimTime = 25000; Sum.u64 = 228537; SumSQ.u64 = 2796611493; Count.u64 = 25; Min.u64 = 1193; Max.u64 = 17579;
184185
StatBasic9.stat3_I32.3 : Accumulator : SimTime = 25000; Sum.i32 = -639; SumSQ.i32 = 426059; Count.u64 = 25; Min.i32 = -206; Max.i32 = 183;
@@ -208,6 +209,7 @@ REGISTER CLOCK #1 at 1 ns
208209
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 32000; Sum.u64 = 0; SumSQ.u64 = 0; Count.u64 = 0; Min.u64 = 0; Max.u64 = 0;
209210
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 32000; Sum.i32 = 0; SumSQ.i32 = 0; Count.u64 = 0; Min.i32 = 0; Max.i32 = 0;
210211
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 32000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
212+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 32000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
211213
StatBasic1.stat2_U64.2 : Accumulator : SimTime = 33000; Sum.u64 = 96736; SumSQ.u64 = 1243559678; Count.u64 = 11; Min.u64 = 110; Max.u64 = 18189;
212214
StatBasic1.stat3_I32.3 : Accumulator : SimTime = 33000; Sum.i32 = -282; SumSQ.i32 = 133196; Count.u64 = 8; Min.i32 = -209; Max.i32 = 142;
213215
StatBasic5.stat2_U64.2 : Accumulator : SimTime = 33000; Sum.u64 = 102702; SumSQ.u64 = 1290922584; Count.u64 = 11; Min.u64 = 1481; Max.u64 = 15905;
@@ -254,6 +256,7 @@ REGISTER CLOCK #1 at 1 ns
254256
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 40000; Sum.u64 = 0; SumSQ.u64 = 0; Count.u64 = 0; Min.u64 = 0; Max.u64 = 0;
255257
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 40000; Sum.i32 = 0; SumSQ.i32 = 0; Count.u64 = 0; Min.i32 = 0; Max.i32 = 0;
256258
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 40000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
259+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 40000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
257260
StatBasic0.stat1_U32.1 : Accumulator : SimTime = 40000; Sum.u32 = 8196; SumSQ.u32 = 2330160; Count.u64 = 40; Min.u32 = 2; Max.u32 = 420;
258261
StatBasic4.stat1_U32.1 : Accumulator : SimTime = 40000; Sum.u32 = 8805; SumSQ.u32 = 2512037; Count.u64 = 40; Min.u32 = 24; Max.u32 = 415;
259262
StatBasic1.stat3_I32.3 : Accumulator : SimTime = 41000; Sum.i32 = -379; SumSQ.i32 = 308235; Count.u64 = 16; Min.i32 = -212; Max.i32 = 154;
@@ -284,6 +287,7 @@ REGISTER CLOCK #1 at 1 ns
284287
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 48000; Sum.u64 = 0; SumSQ.u64 = 0; Count.u64 = 0; Min.u64 = 0; Max.u64 = 0;
285288
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 48000; Sum.i32 = 0; SumSQ.i32 = 0; Count.u64 = 0; Min.i32 = 0; Max.i32 = 0;
286289
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 48000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
290+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 48000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;
287291
StatBasic1.stat3_I32.3 : Accumulator : SimTime = 49000; Sum.i32 = -889; SumSQ.i32 = 388791; Count.u64 = 24; Min.i32 = -212; Max.i32 = 154;
288292
StatBasic1.stat4_I64.4 : Accumulator : SimTime = 49000; Sum.i64 = -25149; SumSQ.i64 = 517381441; Count.u64 = 14; Min.i64 = -8986; Max.i64 = 8891;
289293
StatBasic5.stat3_I32.3 : Accumulator : SimTime = 49000; Sum.i32 = -177; SumSQ.i32 = 438995; Count.u64 = 24; Min.i32 = -197; Max.i32 = 211;
@@ -321,6 +325,7 @@ REGISTER CLOCK #1 at 1 ns
321325
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 56000; Sum.u64 = 51950; SumSQ.u64 = 557787504; Count.u64 = 6; Min.u64 = 4959; Max.u64 = 15200;
322326
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 56000; Sum.i32 = -274; SumSQ.i32 = 79970; Count.u64 = 6; Min.i32 = -190; Max.i32 = 118;
323327
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 56000; Sum.i64 = 11978; SumSQ.i64 = 234838356; Count.u64 = 6; Min.i64 = -9173; Max.i64 = 8145;
328+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 56000; Sum.i64 = 3141; SumSQ.i64 = 360939661; Count.u64 = 6; Min.i64 = -8884; Max.i64 = 8927;
324329
StatBasic0.stat3_I32.3 : Accumulator : SimTime = 56000; Sum.i32 = -465; SumSQ.i32 = 476753; Count.u64 = 31; Min.i32 = -190; Max.i32 = 206;
325330
StatBasic4.stat3_I32.3 : Accumulator : SimTime = 56000; Sum.i32 = 264; SumSQ.i32 = 463384; Count.u64 = 31; Min.i32 = -209; Max.i32 = 200;
326331
StatBasic1.stat3_I32.3 : Accumulator : SimTime = 57000; Sum.i32 = -1423; SumSQ.i32 = 569767; Count.u64 = 32; Min.i32 = -212; Max.i32 = 154;
@@ -367,6 +372,7 @@ REGISTER CLOCK #1 at 1 ns
367372
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 64000; Sum.u64 = 121275; SumSQ.u64 = 1385165133; Count.u64 = 14; Min.u64 = 631; Max.u64 = 17964;
368373
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 64000; Sum.i32 = -833; SumSQ.i32 = 189669; Count.u64 = 14; Min.i32 = -210; Max.i32 = 118;
369374
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 64000; Sum.i64 = 25380; SumSQ.i64 = 363474430; Count.u64 = 14; Min.i64 = -9173; Max.i64 = 8145;
375+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 64000; Sum.i64 = -1792; SumSQ.i64 = 607724106; Count.u64 = 14; Min.i64 = -8884; Max.i64 = 8927;
370376
StatBasic0.stat1_U32.1 : Accumulator : SimTime = 65000; Sum.u32 = 13858; SumSQ.u32 = 4018652; Count.u64 = 65; Min.u32 = 2; Max.u32 = 429;
371377
StatBasic4.stat1_U32.1 : Accumulator : SimTime = 65000; Sum.u32 = 14469; SumSQ.u32 = 4172979; Count.u64 = 65; Min.u32 = 9; Max.u32 = 423;
372378
StatBasic1.stat1_U32.1 : Accumulator : SimTime = 66000; Sum.u32 = 14777; SumSQ.u32 = 4488365; Count.u64 = 66; Min.u32 = 3; Max.u32 = 426;
@@ -395,6 +401,7 @@ REGISTER CLOCK #1 at 1 ns
395401
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 72000; Sum.u64 = 207870; SumSQ.u64 = 2627061398; Count.u64 = 22; Min.u64 = 631; Max.u64 = 17964;
396402
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 72000; Sum.i32 = -693; SumSQ.i32 = 280589; Count.u64 = 22; Min.i32 = -210; Max.i32 = 201;
397403
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 72000; Sum.i64 = 3852; SumSQ.i64 = 556596750; Count.u64 = 22; Min.i64 = -9173; Max.i64 = 8145;
404+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 72000; Sum.i64 = 262; SumSQ.i64 = 838479848; Count.u64 = 22; Min.i64 = -8884; Max.i64 = 8927;
398405
StatBasic9.stat1_U32.1 : Accumulator : SimTime = 75000; Sum.u32 = 16237; SumSQ.u32 = 4637323; Count.u64 = 75; Min.u32 = 0; Max.u32 = 416;
399406
StatBasic9.stat2_U64.2 : Accumulator : SimTime = 75000; Sum.u64 = 693124; SumSQ.u64 = 8766036464; Count.u64 = 75; Min.u64 = 438; Max.u64 = 18361;
400407
StatBasic9.stat3_I32.3 : Accumulator : SimTime = 75000; Sum.i32 = -584; SumSQ.i32 = 1175516; Count.u64 = 75; Min.i32 = -213; Max.i32 = 209;
@@ -436,6 +443,7 @@ REGISTER CLOCK #1 at 1 ns
436443
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 80000; Sum.u64 = 280594; SumSQ.u64 = 3468602710; Count.u64 = 30; Min.u64 = 631; Max.u64 = 17964;
437444
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 80000; Sum.i32 = -283; SumSQ.i32 = 453771; Count.u64 = 30; Min.i32 = -210; Max.i32 = 201;
438445
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 80000; Sum.i64 = 23196; SumSQ.i64 = 810886310; Count.u64 = 30; Min.i64 = -9173; Max.i64 = 8382;
446+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 80000; Sum.i64 = 398; SumSQ.i64 = 922483596; Count.u64 = 30; Min.i64 = -8884; Max.i64 = 8927;
439447
StatBasic0.stat1_U32.1 : Accumulator : SimTime = 80000; Sum.u32 = 17165; SumSQ.u32 = 4979851; Count.u64 = 80; Min.u32 = 2; Max.u32 = 429;
440448
StatBasic4.stat1_U32.1 : Accumulator : SimTime = 80000; Sum.u32 = 16768; SumSQ.u32 = 4790640; Count.u64 = 80; Min.u32 = 0; Max.u32 = 423;
441449
StatBasic3.stat1_U32.1 : Accumulator : SimTime = 81000; Sum.u32 = 17388; SumSQ.u32 = 4989548; Count.u64 = 81; Min.u32 = 0; Max.u32 = 427;
@@ -460,6 +468,7 @@ REGISTER CLOCK #1 at 1 ns
460468
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 88000; Sum.u64 = 372751; SumSQ.u64 = 4719462263; Count.u64 = 38; Min.u64 = 631; Max.u64 = 18268;
461469
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 88000; Sum.i32 = -188; SumSQ.i32 = 612808; Count.u64 = 38; Min.i32 = -210; Max.i32 = 201;
462470
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 88000; Sum.i64 = 47540; SumSQ.i64 = 975954184; Count.u64 = 38; Min.i64 = -9173; Max.i64 = 8382;
471+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 88000; Sum.i64 = 12697; SumSQ.i64 = 1183269059; Count.u64 = 38; Min.i64 = -8884; Max.i64 = 8927;
463472
StatBasic1.stat1_U32.1 : Accumulator : SimTime = 90000; Sum.u32 = 19786; SumSQ.u32 = 5902714; Count.u64 = 90; Min.u32 = 3; Max.u32 = 426;
464473
StatBasic3.stat1_U32.1 : Accumulator : SimTime = 90000; Sum.u32 = 18966; SumSQ.u32 = 5441404; Count.u64 = 90; Min.u32 = 0; Max.u32 = 427;
465474
StatBasic3.stat3_I32.3 : Accumulator : SimTime = 90000; Sum.i32 = -1815; SumSQ.i32 = 1335781; Count.u64 = 90; Min.i32 = -210; Max.i32 = 207;
@@ -494,6 +503,7 @@ REGISTER CLOCK #1 at 1 ns
494503
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 96000; Sum.u64 = 436893; SumSQ.u64 = 5316379291; Count.u64 = 46; Min.u64 = 631; Max.u64 = 18268;
495504
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 96000; Sum.i32 = -708; SumSQ.i32 = 779546; Count.u64 = 46; Min.i32 = -210; Max.i32 = 201;
496505
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 96000; Sum.i64 = 33537; SumSQ.i64 = 1275048859; Count.u64 = 46; Min.i64 = -9173; Max.i64 = 8382;
506+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 96000; Sum.i64 = 24899; SumSQ.i64 = 1453742083; Count.u64 = 46; Min.i64 = -8884; Max.i64 = 8927;
497507
StatBasic0.stat3_I32.3 : Accumulator : SimTime = 98000; Sum.i32 = -505; SumSQ.i32 = 495963; Count.u64 = 35; Min.i32 = -190; Max.i32 = 206;
498508
StatBasic4.stat3_I32.3 : Accumulator : SimTime = 98000; Sum.i32 = 363; SumSQ.i32 = 567545; Count.u64 = 35; Min.i32 = -214; Max.i32 = 202;
499509
StatBasic1.stat2_U64.2 : Accumulator : SimTime = 99000; Sum.u64 = 96400; SumSQ.u64 = 1250004698; Count.u64 = 11; Min.u64 = 456; Max.u64 = 16833;
@@ -547,6 +557,7 @@ REGISTER CLOCK #1 at 1 ns
547557
StatGlobal1.stat2_U64.2 : Accumulator : SimTime = 101000; Sum.u64 = 484192; SumSQ.u64 = 5839297154; Count.u64 = 51; Min.u64 = 631; Max.u64 = 18268;
548558
StatGlobal1.stat3_I32.3 : Accumulator : SimTime = 101000; Sum.i32 = -668; SumSQ.i32 = 836096; Count.u64 = 51; Min.i32 = -210; Max.i32 = 201;
549559
StatGlobal1.stat4_I64.4 : Accumulator : SimTime = 101000; Sum.i64 = 42199; SumSQ.i64 = 1360845285; Count.u64 = 51; Min.i64 = -9173; Max.i64 = 8382;
560+
StatGlobal0.stat5_dyn : Accumulator : SimTime = 101000; Sum.i64 = 8297; SumSQ.i64 = 1636072421; Count.u64 = 51; Min.i64 = -9218; Max.i64 = 8927;
550561
StatBasic0.stat2_U64.2 : Accumulator : SimTime = 101000; Sum.u64 = 14444; SumSQ.u64 = 208629136; Count.u64 = 1; Min.u64 = 14444; Max.u64 = 14444;
551562
StatBasic4.stat2_U64.2 : Accumulator : SimTime = 101000; Sum.u64 = 13421; SumSQ.u64 = 180123241; Count.u64 = 1; Min.u64 = 13421; Max.u64 = 13421;
552563
StatBasic0.stat4_I64.4 : Accumulator : SimTime = 101000; Sum.i64 = 0; SumSQ.i64 = 0; Count.u64 = 0; Min.i64 = 0; Max.i64 = 0;

0 commit comments

Comments
 (0)