Include all boundary cells in GlobalNy #1829
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `GlobalNx`, `GlobalNy` variables include boundary cells, but previously `GlobalNy` only included boundary cells from one divertor. If a second divertor boundary is present, the guard cells from there should also be included. This change makes `GlobalNy` consistent with `getGlobalYIndex` in the sense that on the last processor `getGlobalYIndex(LocalNy) == GlobalNy` always.
johnomotani
added
the
small-change
johnomotani
force-pushed
the
globalny-fix
branch
2 times, most recently
from
7351f6d
to
e13ce3b
Compare
Allows calculating the number of boundary cells in the global y-grid.
After changing defition of GlobalNy, need to update its uses. Vol_Integral() seems to have been incorrect previously, since it used a number of points including boundary cells to weight the integral.
johnomotani
force-pushed
the
globalny-fix
branch
from
e13ce3b
to
ca055d0
Compare
Error in conditional meant method returned the wrong result.
The correct value for the total number of y-boundary cells is mesh.numberOfYBoundaries()*2*mesh.ystart As there are two boundaries (upper and lower) containing mesh.ystart cells each for each boundary. Previously the factor of 2 was missed in several places in the recent re-definition of GlobalNy. The use in Vol_Integral was missing a factor of mesh.ystart as well.
|
The Travis tests are not completing because they time out when |
|
Not to my knowledge. The same tests work fine on other builds. I'll have a look on my machine now |
|
Works on my machine too, so must be something about travis. Will investigate further this afternoon |
ZedThree
reviewed
Nov 4, 2019
ZedThree
reviewed
Nov 4, 2019
GlobalNx is used as the default for ixseps1 and ixseps2 so needs to be initialised first, while GlobalNy uses jyseps1_2 and jyseps2_1 so does need to be initialised after the separatrix positions are loaded.
An identical check is already performed above the one removed in this commit.
ZedThree
reviewed
Nov 4, 2019
|
Please can you add a section at the top of # Change Log
## [v5.0.0-alpha](https://github.com/boutproject/BOUT-dev/tree/next)
[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.3.0...next)
### Breaking changes
- `BoutMesh::GlobalNy` now counts points from all
y-boundaries. Previously it only counted points from one boundary
[\#1829](https://github.com/boutproject/BOUT-dev/pull/1829) |
johnomotani
added
the
breaking change
ZedThree
approved these changes
Nov 5, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
GlobalNx,GlobalNyvariables include boundary cells, but previouslyGlobalNyonly included boundary cells from one divertor. If a second divertor boundary is present, the guard cells from there should also be included. This change makesGlobalNyconsistent withgetGlobalYIndexin the sense that on the last processorgetGlobalYIndex(LocalNy) == GlobalNyalways.The lines setting the global grid sizes are moved below those getting the separatrix/X-point locations just so that setting
GlobalNycan usejyseps2_1andjyseps1_2- the other lines are not changed.