Skip to content

Commit

Permalink
CrsGraph: initialize inConstruction flag in ctor
Browse files Browse the repository at this point in the history 
uninitialized bool was causing initialization to be skipped

With this commit, all tests pass:

Test project
/ascldap/users/jhu/exawind/build-naluwind-gcc-7.2.0-openmpi-1.10.1-opt
      Start 75: oversetHybrid
      Start 33: heatedBackStep
 1/77 Test Exawind#33: heatedBackStep .........................   Passed
227.44 sec
      Start 38: hoVortex
      Start 63: quad9HC
 2/77 Test Exawind#63: quad9HC ................................   Passed
71.32 sec
      Start 66: variableDensNonIso
 3/77 Test Exawind#38: hoVortex ...............................   Passed
117.75 sec
      Start 67: variableDensNonUniform
 4/77 Test Exawind#67: variableDensNonUniform .................   Passed
77.28 sec
      Start 73: unitTest1
      Start 57: periodic3dElemNp1
 5/77 Test Exawind#66: variableDensNonIso .....................   Passed
139.80 sec
      Start 47: nonConformalWithPeriodic
 6/77 Test Exawind#57: periodic3dElemNp1 ......................   Passed
18.53 sec
      Start 42: kovasznay_P5
 7/77 Test Exawind#73: unitTest1 ..............................   Passed
23.09 sec
      Start 60: periodic3dEdgeNp1
 8/77 Test Exawind#60: periodic3dEdgeNp1 ......................   Passed
8.00 sec
      Start 41: karmanVortex
 9/77 Test Exawind#42: kovasznay_P5 ...........................   Passed
13.79 sec
10/77 Test Exawind#41: karmanVortex ...........................   Passed
1.96 sec
      Start 74: unitTest2
11/77 Test Exawind#47: nonConformalWithPeriodic ...............   Passed
18.18 sec
      Start 48: nonConformalWithPeriodicConsolidated
12/77 Test Exawind#74: unitTest2 ..............................   Passed
13.63 sec
      Start 31: femHCGL
13/77 Test Exawind#48: nonConformalWithPeriodicConsolidated ...   Passed
14.57 sec
      Start 26: elemClosedDomain
14/77 Test Exawind#31: femHCGL ................................   Passed
3.85 sec
      Start 30: femHC
15/77 Test Exawind#26: elemClosedDomain .......................   Passed
3.95 sec
      Start 19: ductElemWedge
16/77 Test Exawind#30: femHC ..................................   Passed
3.90 sec
      Start 20: ductWedge
17/77 Test Exawind#19: ductElemWedge ..........................   Passed
2.54 sec
18/77 Test Exawind#20: ductWedge ..............................   Passed
1.73 sec
      Start 53: nonIsoNonUniformElemOpenJet
19/77 Test Exawind#53: nonIsoNonUniformElemOpenJet ............   Passed
165.31 sec
      Start 43: milestoneRun
20/77 Test Exawind#43: milestoneRun ...........................   Passed
115.86 sec
      Start  4: ablUnstableEdge
21/77 Test  Exawind#4: ablUnstableEdge ........................   Passed
89.04 sec
      Start 64: steadyTaylorVortex
22/77 Test Exawind#64: steadyTaylorVortex .....................   Passed
121.05 sec
      Start 44: milestoneRunConsolidated
23/77 Test Exawind#75: oversetHybrid ..........................   Passed
1017.76 sec
      Start 77: waleElemXflowMixFrac3.5m
24/77 Test Exawind#44: milestoneRunConsolidated ...............   Passed
104.43 sec
      Start  3: ablStableElem
25/77 Test  Exawind#3: ablStableElem ..........................   Passed
87.88 sec
      Start 52: nonIsoNonUniformEdgeOpenJet
26/77 Test Exawind#52: nonIsoNonUniformEdgeOpenJet ............   Passed
63.72 sec
      Start 16: dgNonConformalFluids
27/77 Test Exawind#16: dgNonConformalFluids ...................   Passed
61.76 sec
      Start 50: nonIsoElemOpenJet
28/77 Test Exawind#50: nonIsoElemOpenJet ......................   Passed
61.97 sec
      Start 17: dgNonConformalFluidsEdge
29/77 Test Exawind#17: dgNonConformalFluidsEdge ...............   Passed
50.90 sec
      Start 51: nonIsoElemOpenJetConsolidated
30/77 Test Exawind#51: nonIsoElemOpenJetConsolidated ..........   Passed
52.57 sec
      Start  5: ablUnstableEdge_ra
31/77 Test  Exawind#5: ablUnstableEdge_ra .....................   Passed
37.09 sec
      Start 24: ekmanSpiralConsolidated
32/77 Test Exawind#24: ekmanSpiralConsolidated ................   Passed
43.84 sec
      Start 40: inputFireElem
33/77 Test Exawind#77: waleElemXflowMixFrac3.5m ...............   Passed
516.90 sec
      Start 37: hoHelium
34/77 Test Exawind#40: inputFireElem ..........................   Passed
42.54 sec
      Start 34: heatedWaterChannelEdge
35/77 Test Exawind#34: heatedWaterChannelEdge .................   Passed
37.97 sec
      Start 18: dgNonConformalThreeBlade
36/77 Test Exawind#18: dgNonConformalThreeBlade ...............   Passed
245.03 sec
      Start 49: nonIsoEdgeOpenJet
37/77 Test Exawind#49: nonIsoEdgeOpenJet ......................   Passed
23.74 sec
      Start  6: concentricRad
38/77 Test  Exawind#6: concentricRad ..........................   Passed
25.52 sec
      Start 11: dgNonConformal3dFluidsHexTet
39/77 Test Exawind#11: dgNonConformal3dFluidsHexTet ...........   Passed
134.40 sec
      Start 29: elemPipeCHT
40/77 Test Exawind#29: elemPipeCHT ............................   Passed
18.82 sec
      Start 23: ekmanSpiral
41/77 Test Exawind#37: hoHelium ...............................   Passed
539.10 sec
      Start 71: hoVortex_P2
42/77 Test Exawind#23: ekmanSpiral ............................   Passed
14.30 sec
      Start 10: dgNonConformal3dFluids
43/77 Test Exawind#10: dgNonConformal3dFluids .................   Passed
117.65 sec
      Start 25: elemBackStepLRSST
44/77 Test Exawind#25: elemBackStepLRSST ......................   Passed
11.00 sec
      Start 46: movingCylinder
45/77 Test Exawind#46: movingCylinder .........................   Passed
12.13 sec
      Start 22: edgePipeCHT
46/77 Test Exawind#22: edgePipeCHT ............................   Passed
10.90 sec
      Start 39: inputFireEdgeUpwind
47/77 Test Exawind#39: inputFireEdgeUpwind ....................   Passed
7.94 sec
      Start  9: dgNonConformal
48/77 Test  Exawind#9: dgNonConformal .........................   Passed
8.07 sec
      Start 58: periodic3dElemNp4
49/77 Test Exawind#58: periodic3dElemNp4 ......................   Passed
5.47 sec
      Start 61: periodic3dEdgeNp4
50/77 Test Exawind#61: periodic3dEdgeNp4 ......................   Passed
3.82 sec
      Start 35: heatedWaterChannelElem
51/77 Test Exawind#35: heatedWaterChannelElem .................   Passed
20.46 sec
      Start 13: dgNonConformalEdge
52/77 Test Exawind#13: dgNonConformalEdge .....................   Passed
7.60 sec
53/77 Test Exawind#71: hoVortex_P2 ............................   Passed
384.64 sec
      Start 36: heliumPlume
54/77 Test Exawind#36: heliumPlume ............................   Passed
226.47 sec
      Start 76: uqSlidingMeshDG
55/77 Test Exawind#76: uqSlidingMeshDG ........................   Passed
216.66 sec
      Start 70: cvfemHexHC_P3
56/77 Test Exawind#70: cvfemHexHC_P3 ..........................   Passed
235.98 sec
      Start 32: fluidsPmrChtPeriodic
57/77 Test Exawind#32: fluidsPmrChtPeriodic ...................   Passed
99.94 sec
      Start 72: steadyTaylorVortex_P4
58/77 Test Exawind#72: steadyTaylorVortex_P4 ..................   Passed
154.11 sec
      Start 68: variableDensNonUniform_P5
59/77 Test Exawind#68: variableDensNonUniform_P5 ..............   Passed
187.59 sec
      Start  1: ablNeutralEdge
60/77 Test  Exawind#1: ablNeutralEdge .........................   Passed
78.58 sec
      Start 27: elemHybridFluids
61/77 Test Exawind#27: elemHybridFluids .......................   Passed
94.55 sec
      Start 69: BoussinesqNonIso
62/77 Test Exawind#69: BoussinesqNonIso .......................   Passed
90.32 sec
      Start 28: elemHybridFluidsShift
63/77 Test Exawind#28: elemHybridFluidsShift ..................   Passed
88.30 sec
      Start 65: tensor_tg_mms
64/77 Test Exawind#65: tensor_tg_mms ..........................   Passed
98.70 sec
      Start 15: dgNonConformalElemCylinder
65/77 Test Exawind#15: dgNonConformalElemCylinder .............   Passed
103.07 sec
      Start 21: edgeHybridFluids
66/77 Test Exawind#21: edgeHybridFluids .......................   Passed
61.73 sec
      Start  8: dgMMS
      Start 55: oversetFluids
67/77 Test Exawind#55: oversetFluids ..........................   Passed
23.22 sec
      Start 56: oversetFluidsEdge
68/77 Test Exawind#56: oversetFluidsEdge ......................   Passed
21.07 sec
      Start 54: overset
69/77 Test Exawind#54: overset ................................   Passed
2.16 sec
70/77 Test  Exawind#8: dgMMS ..................................   Passed
51.45 sec
      Start 12: dgNonConformal3dFluidsP1P2
71/77 Test Exawind#12: dgNonConformal3dFluidsP1P2 .............   Passed
294.81 sec
      Start 45: mixedTetPipe
72/77 Test Exawind#45: mixedTetPipe ...........................   Passed
30.65 sec
      Start 14: dgNonConformalEdgeCylinder
73/77 Test Exawind#14: dgNonConformalEdgeCylinder .............   Passed
65.57 sec
      Start  7: cvfemHC
74/77 Test  Exawind#7: cvfemHC ................................   Passed
10.66 sec
      Start 59: periodic3dElemNp8
75/77 Test Exawind#59: periodic3dElemNp8 ......................   Passed
3.86 sec
      Start 62: periodic3dEdgeNp8
76/77 Test Exawind#62: periodic3dEdgeNp8 ......................   Passed
2.54 sec
      Start  2: ablNeutralEdgeSegregated
77/77 Test  Exawind#2: ablNeutralEdgeSegregated ...............   Passed
67.66 sec

100% tests passed, 0 tests failed out of 77

Label Time Summary:
performance     = 14010.66 sec*proc (3 tests)
regression      = 26090.50 sec*proc (68 tests)
unit            =  50.35 sec*proc (2 tests)
verification    = 6920.38 sec*proc (4 tests)

Total Test time (real) = 4722.03 sec
  • Loading branch information
@jhux2
jhux2 committed Nov 21, 2019
1 parent 7ee8061 commit 2ded136
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/CrsGraph.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace nalu{
CrsGraph::CrsGraph(
Realm &realm,
const unsigned numDof)
: realm_(realm), numDof_(numDof)
: realm_(realm), numDof_(numDof), inConstruction_(false)
{}

CrsGraph::~CrsGraph() {}
Expand Down Expand Up @@ -163,7 +163,7 @@ void CrsGraph::beginConstruction()
LocalOrdinal numSharedNotOwnedNotLocallyOwned = 0; // these are nodes on other procs
// First, get the number of owned and sharedNotOwned (or num_sharedNotOwned_nodes = num_nodes - num_owned_nodes)
//KOKKOS: BucketLoop parallel "reduce" is accumulating 4 sums
kokkos_parallel_for("Nalu::CrsGraph::beginLinearSystemConstructionA", buckets.size(), [&] (const int& ib) {
kokkos_parallel_for("Nalu::CrsGraph::beginConstructionA", buckets.size(), [&] (const int& ib) {
stk::mesh::Bucket & b = *buckets[ib];
const stk::mesh::Bucket::size_type length = b.size();
//KOKKOS: intra BucketLoop parallel reduce
Expand Down

0 comments on commit 2ded136

Please sign in to comment.