-
Notifications
You must be signed in to change notification settings - Fork 95
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
Update documentation for Passing data into expressions #2928
Open
tbody-cfs
wants to merge
1
commit into
boutproject:master
Choose a base branch
from
tbody-cfs:docs-update-passing-data-into-expressions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -328,22 +328,20 @@ to ``generate`` in the ``Context`` object. | |
|
||
Field3D shear = ...; // Value calculated in BOUT++ | ||
|
||
FieldFactory factory(mesh); | ||
auto gen = factory->parse("model:viscosity"); | ||
Options& model_options = options["model"]; | ||
auto str = model_options["viscosity"].doc("Viscosity").as<std::string()>; | ||
|
||
auto gen = FieldFactory::get()->parse(str, &model_options); | ||
|
||
Field3D viscosity; | ||
viscosity.allocate(); | ||
|
||
BOUT_FOR(i, viscosity.region("RGN_ALL")) { | ||
viscosity[i] = gen->generate(bout::generator::Context(i, CELL_CENTRE, mesh, 0.0) | ||
.set("shear", shear[i])); | ||
|
||
BOUT_FOR(i, viscosity.getRegion("RGN_ALL")) { | ||
viscosity[i] = gen->generate(bout::generator::Context().set("shear", shear[i])); | ||
} | ||
|
||
Note that the ``Context`` constructor takes the index, the cell | ||
location (e.g. staggered), a mesh, and then the time (set to 0.0 | ||
here). Additional variables can be ``set``, "shear" in this case. In | ||
the input options file (or command line) the viscosity could now be a | ||
function of ``{shear}`` | ||
Comment on lines
-342
to
-346
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @tbody-cfs any reason why this has been deleted? |
||
In the input options file (or command line) the viscosity can now be written as | ||
a function of ``{shear}`` | ||
|
||
.. code-block:: cfg | ||
|
||
|
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.
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.
This will use the default
Context()
constructor (https://github.com/boutproject/BOUT-dev/blob/master/include/bout/sys/generator_context.hxx#L19) so "x", "y", "z", "t" will not be defined. Recommend instead using the originalContext(i, CELL_CENTRE, mesh, 0.0)