-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Nacelle model #3
Conversation
…or actuator line simulations of wind turbines
…ded turbine documentation file, and fixed minor formatting in actuator line file.
docs/source/theory/windEnergy.rst
Outdated
@@ -411,8 +411,57 @@ Renewable Energy Laboratory (NREL). The :class:`ActuatorLineFAST | |||
<sierra::nalu::ActuatorLineFAST>` class allows Nalu-Wind to interface as an inflow | |||
module to OpenFAST by supplying the velocity field information. | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove
docs/source/theory/windEnergy.rst
Outdated
Nalu-Wind -- OpenFAST Coupling Algorithm | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
======= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove conflict markers
docs/source/theory/windEnergy.rst
Outdated
|
||
Nalu -- OpenFAST Coupling Algorithm | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
>>>>>>> tonynalu/master |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove conflict marker
docs/source/theory/windEnergy.rst
Outdated
@@ -422,10 +471,17 @@ FSI model is used to interface Nalu-Wind with the turbine model in OpenFAST: | |||
|
|||
+ The velocity at time step at time step :math:`n` is sampled at the actuator | |||
points and sent to OpenFAST, | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove conflict marker
Ugh, sorry when I was searching for |
@@ -0,0 +1,10 @@ | |||
0.7904108794804533 1 0.0625 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, just saw this... this file should be nrel5MWactuatorLine.norm.gold
@sayerhs I removed the norm file. If you green light it, I will merge this. |
They now both use the new MultiDimViews class. Next step will be to make them both have the same template parameters.
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
* Added body force term and changed filters from \tilde to \widetilde * Modified momentum forcing source term to include density averaging. * Added documentation for ABL source term * Removed comment for debugging * Updated ablForcingEdge norm gold standard for latest ABL forcing subroutine * Added Shreyas' comments on the pull request. * Removed commented code for density * Added braces to fix scope of if-statements * Fixed infenitesimally thins slice sentece in documentation * Changed order of variable declarations to avoid compiler warning * Setting up for a different spreading function for the nacelle point for actuator line simulations of wind turbines * Added Nacelle Model * Adding input of air density to calculate force on Nacelle * Nacelle Model incorporated. * Nacelle model is only active if cd is grater than zero * Assign standard epsilon value to hub when nacelle not active * Updated reg test for nrel5MW by adding the nacelle and gold standard file * Added documentation file for the turbine models * Changed the gold standard to work with latest version of OpenFAST, added turbine documentation file, and fixed minor formatting in actuator line file. * Resolving existing conflicts in windEnergy.rst. * Removing nrel5MWactuatorLine.norm file.
Adding interior deformation class
) * Separate graph and solver types Add new CrsGraphTypes namespace that LinearSolverTypes pulls in. * Rename linear system helper file Rename file holding Crs graph helper functions. The new name reflects that the functions are for the matrix graph. * Add new CrsGraph class This is a step towards removing the matrix graph creation/initialization that is currently in TpetraLinearSystem. Currently, CrsGraph duplicates functionality TpetraLinearSystem. Everything compiles. * Move graph from TpetraLinearSystem to CrsGraph This commit adds a CrsGraph object to TpetraLinearSystem and forwards graph requests to the CrsGraph class. NaluWind compiles and regression test "AblNeutralEdge" runs. * Code clean up remove code that has been moved to CrsGraph * Fix unit test compilation Reenable methods getRowLID and getColLID, which are used in unit testing. Change header inclusion. * CrsGraph: initialize inConstruction flag in ctor 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 #33: heatedBackStep ......................... Passed 227.44 sec Start 38: hoVortex Start 63: quad9HC 2/77 Test #63: quad9HC ................................ Passed 71.32 sec Start 66: variableDensNonIso 3/77 Test #38: hoVortex ............................... Passed 117.75 sec Start 67: variableDensNonUniform 4/77 Test #67: variableDensNonUniform ................. Passed 77.28 sec Start 73: unitTest1 Start 57: periodic3dElemNp1 5/77 Test #66: variableDensNonIso ..................... Passed 139.80 sec Start 47: nonConformalWithPeriodic 6/77 Test #57: periodic3dElemNp1 ...................... Passed 18.53 sec Start 42: kovasznay_P5 7/77 Test #73: unitTest1 .............................. Passed 23.09 sec Start 60: periodic3dEdgeNp1 8/77 Test #60: periodic3dEdgeNp1 ...................... Passed 8.00 sec Start 41: karmanVortex 9/77 Test #42: kovasznay_P5 ........................... Passed 13.79 sec 10/77 Test #41: karmanVortex ........................... Passed 1.96 sec Start 74: unitTest2 11/77 Test #47: nonConformalWithPeriodic ............... Passed 18.18 sec Start 48: nonConformalWithPeriodicConsolidated 12/77 Test #74: unitTest2 .............................. Passed 13.63 sec Start 31: femHCGL 13/77 Test #48: nonConformalWithPeriodicConsolidated ... Passed 14.57 sec Start 26: elemClosedDomain 14/77 Test #31: femHCGL ................................ Passed 3.85 sec Start 30: femHC 15/77 Test #26: elemClosedDomain ....................... Passed 3.95 sec Start 19: ductElemWedge 16/77 Test #30: femHC .................................. Passed 3.90 sec Start 20: ductWedge 17/77 Test #19: ductElemWedge .......................... Passed 2.54 sec 18/77 Test #20: ductWedge .............................. Passed 1.73 sec Start 53: nonIsoNonUniformElemOpenJet 19/77 Test #53: nonIsoNonUniformElemOpenJet ............ Passed 165.31 sec Start 43: milestoneRun 20/77 Test #43: milestoneRun ........................... Passed 115.86 sec Start 4: ablUnstableEdge 21/77 Test #4: ablUnstableEdge ........................ Passed 89.04 sec Start 64: steadyTaylorVortex 22/77 Test #64: steadyTaylorVortex ..................... Passed 121.05 sec Start 44: milestoneRunConsolidated 23/77 Test #75: oversetHybrid .......................... Passed 1017.76 sec Start 77: waleElemXflowMixFrac3.5m 24/77 Test #44: milestoneRunConsolidated ............... Passed 104.43 sec Start 3: ablStableElem 25/77 Test #3: ablStableElem .......................... Passed 87.88 sec Start 52: nonIsoNonUniformEdgeOpenJet 26/77 Test #52: nonIsoNonUniformEdgeOpenJet ............ Passed 63.72 sec Start 16: dgNonConformalFluids 27/77 Test #16: dgNonConformalFluids ................... Passed 61.76 sec Start 50: nonIsoElemOpenJet 28/77 Test #50: nonIsoElemOpenJet ...................... Passed 61.97 sec Start 17: dgNonConformalFluidsEdge 29/77 Test #17: dgNonConformalFluidsEdge ............... Passed 50.90 sec Start 51: nonIsoElemOpenJetConsolidated 30/77 Test #51: nonIsoElemOpenJetConsolidated .......... Passed 52.57 sec Start 5: ablUnstableEdge_ra 31/77 Test #5: ablUnstableEdge_ra ..................... Passed 37.09 sec Start 24: ekmanSpiralConsolidated 32/77 Test #24: ekmanSpiralConsolidated ................ Passed 43.84 sec Start 40: inputFireElem 33/77 Test #77: waleElemXflowMixFrac3.5m ............... Passed 516.90 sec Start 37: hoHelium 34/77 Test #40: inputFireElem .......................... Passed 42.54 sec Start 34: heatedWaterChannelEdge 35/77 Test #34: heatedWaterChannelEdge ................. Passed 37.97 sec Start 18: dgNonConformalThreeBlade 36/77 Test #18: dgNonConformalThreeBlade ............... Passed 245.03 sec Start 49: nonIsoEdgeOpenJet 37/77 Test #49: nonIsoEdgeOpenJet ...................... Passed 23.74 sec Start 6: concentricRad 38/77 Test #6: concentricRad .......................... Passed 25.52 sec Start 11: dgNonConformal3dFluidsHexTet 39/77 Test #11: dgNonConformal3dFluidsHexTet ........... Passed 134.40 sec Start 29: elemPipeCHT 40/77 Test #29: elemPipeCHT ............................ Passed 18.82 sec Start 23: ekmanSpiral 41/77 Test #37: hoHelium ............................... Passed 539.10 sec Start 71: hoVortex_P2 42/77 Test #23: ekmanSpiral ............................ Passed 14.30 sec Start 10: dgNonConformal3dFluids 43/77 Test #10: dgNonConformal3dFluids ................. Passed 117.65 sec Start 25: elemBackStepLRSST 44/77 Test #25: elemBackStepLRSST ...................... Passed 11.00 sec Start 46: movingCylinder 45/77 Test #46: movingCylinder ......................... Passed 12.13 sec Start 22: edgePipeCHT 46/77 Test #22: edgePipeCHT ............................ Passed 10.90 sec Start 39: inputFireEdgeUpwind 47/77 Test #39: inputFireEdgeUpwind .................... Passed 7.94 sec Start 9: dgNonConformal 48/77 Test #9: dgNonConformal ......................... Passed 8.07 sec Start 58: periodic3dElemNp4 49/77 Test #58: periodic3dElemNp4 ...................... Passed 5.47 sec Start 61: periodic3dEdgeNp4 50/77 Test #61: periodic3dEdgeNp4 ...................... Passed 3.82 sec Start 35: heatedWaterChannelElem 51/77 Test #35: heatedWaterChannelElem ................. Passed 20.46 sec Start 13: dgNonConformalEdge 52/77 Test #13: dgNonConformalEdge ..................... Passed 7.60 sec 53/77 Test #71: hoVortex_P2 ............................ Passed 384.64 sec Start 36: heliumPlume 54/77 Test #36: heliumPlume ............................ Passed 226.47 sec Start 76: uqSlidingMeshDG 55/77 Test #76: uqSlidingMeshDG ........................ Passed 216.66 sec Start 70: cvfemHexHC_P3 56/77 Test #70: cvfemHexHC_P3 .......................... Passed 235.98 sec Start 32: fluidsPmrChtPeriodic 57/77 Test #32: fluidsPmrChtPeriodic ................... Passed 99.94 sec Start 72: steadyTaylorVortex_P4 58/77 Test #72: steadyTaylorVortex_P4 .................. Passed 154.11 sec Start 68: variableDensNonUniform_P5 59/77 Test #68: variableDensNonUniform_P5 .............. Passed 187.59 sec Start 1: ablNeutralEdge 60/77 Test #1: ablNeutralEdge ......................... Passed 78.58 sec Start 27: elemHybridFluids 61/77 Test #27: elemHybridFluids ....................... Passed 94.55 sec Start 69: BoussinesqNonIso 62/77 Test #69: BoussinesqNonIso ....................... Passed 90.32 sec Start 28: elemHybridFluidsShift 63/77 Test #28: elemHybridFluidsShift .................. Passed 88.30 sec Start 65: tensor_tg_mms 64/77 Test #65: tensor_tg_mms .......................... Passed 98.70 sec Start 15: dgNonConformalElemCylinder 65/77 Test #15: dgNonConformalElemCylinder ............. Passed 103.07 sec Start 21: edgeHybridFluids 66/77 Test #21: edgeHybridFluids ....................... Passed 61.73 sec Start 8: dgMMS Start 55: oversetFluids 67/77 Test #55: oversetFluids .......................... Passed 23.22 sec Start 56: oversetFluidsEdge 68/77 Test #56: oversetFluidsEdge ...................... Passed 21.07 sec Start 54: overset 69/77 Test #54: overset ................................ Passed 2.16 sec 70/77 Test #8: dgMMS .................................. Passed 51.45 sec Start 12: dgNonConformal3dFluidsP1P2 71/77 Test #12: dgNonConformal3dFluidsP1P2 ............. Passed 294.81 sec Start 45: mixedTetPipe 72/77 Test #45: mixedTetPipe ........................... Passed 30.65 sec Start 14: dgNonConformalEdgeCylinder 73/77 Test #14: dgNonConformalEdgeCylinder ............. Passed 65.57 sec Start 7: cvfemHC 74/77 Test #7: cvfemHC ................................ Passed 10.66 sec Start 59: periodic3dElemNp8 75/77 Test #59: periodic3dElemNp8 ...................... Passed 3.86 sec Start 62: periodic3dEdgeNp8 76/77 Test #62: periodic3dEdgeNp8 ...................... Passed 2.54 sec Start 2: ablNeutralEdgeSegregated 77/77 Test #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 * Add header to fix compile error. * Code cleanup remove ifdef'd out code * TpetraSegregatedLinearSystem uses CrsGraph class Code compiles, ablNeutralEdgeSegregated test passes. * TpetraSegregatedLinearSystem: code cleanup remove inactive code protected by macros * TpetraSegregatedLinearSystem: use Tpetra GIDs in copy_stk_to_tpetra(), use realm_.tpetGlobalId_ instead of realm_.naluGlobalId_ 1/1 Test #2: ablNeutralEdgeSegregated ......... Passed 68.39 sec * Fix cmake error from merge * Add missing beginConstruction * Add matrix graph reuse between physics phases * Add forgotten header. Oops. * add parser option to rebalance mesh using stk_balance (#471) * add parser option to rebalance mesh using stk_balance * Move call to doBalanceNodes after rebalanceMesh * Add throw when rebalance is called with parmetis but Zoltan2 is not built with parmetis enabled * Remove unused non-NGP code (#486) * Remove unused classes after transition to NGP * Remove deprecated code used during NGP transition * Remove OversetManagerSTK in preparation for NGP transition of overset capability (#487) * Prepare for deprecation of STK-search based overset manager * Remove deprecated OversetManagerSTK * Remove deprecated methods related to overset logic - Remove `LinearSystem::prepareConstraints` and its overrides - Remove `SolverAlgorithm::apply_coeff` methods that have NGP versions * Remove the tests from CTestList.cmake also * Hypre regression tests moved into guarded block Regression tests using Hypre as one of their solvers need to be guarded with if(ENABLE_HYPRE) endif() * Airfoil tests using Trilinos solver stack, see issue #492 (#494) * Airfoil tests using Trilinos solver stack, see issue #492 This adds two new tests that use MueLu as preconditioner for the continuity eqs. The convergence behavior is reasonable and sets things well for future GPU testing of inflow/outflow BCs. * Fixing input decks to use the segregated solvers for momentum Fixes #492 * NGP conversion of TpetraLinearSystem::applyDirichletBCs (#493) * NGP conversion of TpetraLinearSystem::applyDirichletBCs with unit-test. * Minor fixes to ensure fields are sync'd correctly (host vs device) * Use NGP_ThrowAssert instead of NGP_ThrowRequire * Fix accidental revert of the mesh submodule. * CrsGraph: ensure finalizeGraph called only once * CrsGraph: initialize variable in ctor * Updates for CrsGraph These commits add the calls buildElemToNodeGraph and buildFaceElemToNodeGraph to various "initalize_connectivity" methods. This effectively creates a superset of graph connectivity for different physics. Also added a check to avoid calling CrsGraph::finalizeGraph multiple times (suggested by RK). Currently, these tests are still failing: 1 - ablNeutralEdge (Failed) 4 - ablUnstableEdge (Failed) 5 - ablUnstableEdge_ra (Failed) 6 - airfoilRANSEdgeTrilinos (Failed) 22 - ductWedge (Failed) 23 - edgeHybridFluids (Failed) 24 - edgePipeCHT (Failed) 43 - karmanVortex (Failed) 50 - nonIsoEdgeOpenJet (Failed) 53 - nonIsoNonUniformEdgeOpenJet (Failed) * Prepare equation systems for common graph * Revert "Updates for CrsGraph" This reverts commit 880555d. * Modify EquationSystems to use a common graph for Tpetra * Common graph initialization refactor - Only initialize graphs if they are required by TpetraLinearSystems - Make sure both hypre and tpetra pathways work correctly * Add timers to track init costs missing from EquationSystem timers * Consolidate buildNodeGraph * Propagate changes to TpetraSegregatedLinearSystem * Fix regression test failures Remove call to finalizeLinearSystem, as was done for other physics * Update unit test helpers Avoids referencing uninitialized maps. However, some tests are still not passing. * Improve unit-testing for sparse-matrix values. (#544) * Improve unit-testing for sparse-matrix values. It used to just compare each matrix column and coefficient to the expected gold values, expecting position to match as well. Now it searchs the matrix row for each gold column and checks if the coefficient matches, and doesn't fail if there are extra columns in the matrix. * Add a check to make sure non-gold columns have coeffs of zero. * Fixing build error after updating Trilinos * NaluWind: fix nonlinear residual Make the nonlinear residual convergence tolerance for momentum and continuity consistent with the tolerance set by the user. * NaluWind: fix compile errors * RegTests: update linear solver input deck Tpetra matrices now potentially store hard zeros, due to refactoring to use pre-computed CrsGraph's. The test fluidsPmrChtPeriodic is sensitive to these zeros, so I've created a new MueLu input deck that drops the hard zeros during multigrid coarsening. * RegTests: new MueLu settings for fluidsPmrChtPeriodic Add aggregation dropping threshold to remove hard zeros due to CrsGraph refactor. * Remove commented out code. * Fix inheritance of nonlinear tolerances This is a much better fix, suggested by Shreyas. Co-authored-by: Johnathan Vo <jvo1012@users.noreply.github.com> Co-authored-by: Shreyas Ananthan <shreyas@umd.edu> Co-authored-by: Luc Berger-Vergiat <lberge@sandia.gov> Co-authored-by: Alan Williams <william@sandia.gov> Co-authored-by: Jon Rood <jon.rood@nrel.gov>
Here I have migrated @tonyinme 's pull request for this from NaluCFD/Nalu here. There were conflicts in the gold file which I think I have taken care of, but there were also small conflicts in
docs/source/user/nalu_run/nalu_inp.rst
anddocs/source/theory/windEnergy.rst
which will need to be double checked.I can't add @tonyinme as a reviewer since he isn't on the organization list yet it seems, but I sent an invite.