Allow specifying which components of q to output on each fgout grid #624
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
Modifications to fgout_module.f90 and fgout_tools.py, primarily. Can now set `fgout.q_out_vars` to a list of which components of q to output for each fgout frame (Fortran indexing). The default is `fgout.q_out_vars = [1,2,3,4]` for all components of q[1:3] and also eta (4), consistent with the previous behavior. The user could also/instead ask to output the topo B as component 5. (If two out of three of h, eta, B are output then the other can be computed from these.) Note that this list is written out to `fgout_grids.data` rather than a boolean list of True/False values for each possible component as is done in other places in GeoClaw.
… D-Claw
When instantiating fgout_tools.FGoutGrid object, new qmap parameter can be set
to 'geoclaw', 'geoclaw-bouss', 'dclaw', or a custom dictionary.
(Eventually add 'dclaw-bouss' option also).
This dictionary has the form `{'h':1, 'hu':2, etc}` with mapping from fgout
variable names to Fortran indices of q in the code creating the fgout output.
|
This has been updated to handle Bouss and D-Claw. When instantiating |
rjleveque
added a commit
to rjleveque/dclaw
that referenced
this pull request
Jul 18, 2024
…rids.data from before v5.11
Now need to call fgout_grid.read_fgout_grids_data() explicitly, but do not need to set format.
this is ignored since it is read from fgout_grids.data. Also properly handle output_format == 2 for binary32.
rjleveque
changed the title
|
I fixed a few issues and I think this is ready to merge. I also updated the documentation, see |
rjleveque
added a commit
to rjleveque/geoclaw
that referenced
this pull request
Aug 25, 2024
This was modified in the shallow/amr2.f90 code to support more fgout flexibility in clawpack#624, and this change is also required in the bouss version. Also enhanced the examples/bouss README files a bit.
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.
Modifications to fgout_module.f90 and fgout_tools.py, primarily. Can now set
fgout.q_out_varsto a list of which components of q to output for each fgout frame (Fortran indexing). The default isfgout.q_out_vars = [1,2,3,4]for all components of q[1:3] and also eta (4), consistent with the previous behavior on standard GeoClaw.The user could also/instead ask to output the topo B as component 5. (If two out of three of h, eta, B are output then the other can be computed from these.)
Note that this list is written out to
fgout_grids.datarather than a boolean list of True/False values for each possible component as is done in other places in GeoClaw. This turned out to be both easier and clearer.I got rid of the
fgout.dclawparameter that was introduced in #617 and all the complication of hard-wiring different sets of variables for geoclaw vs dclaw since this should now allow much more control to use either as well as reducing the size of fgout files when only a few components are desired.For the Boussinesq version of GeoClaw, there are 6 variables in q and so to print out only h,hu,hv,eta you would specify
fgout.q_out_vars = [1,2,3,7], or just[1,7]if you do not want to write the momenta and only want h,eta.Needs some more testing still and I'd be happy for feedback.