Add diag_mode to default diagnostics #462
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
Introduce new diag_mode option to MARBL_generate_diagnostics_file.py; when
diag_mode = 'none', output diagnostic file should be 'never_{op}' for all
variables. When diag_mode = 'minimal', only variables with diag_mode =
'minimal' in diagnostics_latest.json have non-never output frequencies. When
diag_mode is 'full', variables with diag_mode = 'minimal' or 'full' will have
non-never output frequencies.
Call MARBL_generate_diagnostics_file.py with a few different --diag-mode options (and write output to different files)
Previous commit let us call MARBL_generate_diagnostics_file.py from command line, but caused problems when importing generate_diagnostics_file() into a python script. This clean-up allows both use-cases. Also, I renamed diag_mode_opts() -> valid_diag_modes() because that seems like a more descriptive name.
When generating the MARBL diagnostics file with diag_mode=minimal, some variables were being listed as "never_average, never_average" (and others were "medium_average, never_average"); we only need to add never_average to the freq_op list if that list is empty.
|
Just to have this recorded somewhere, I tested this PR in CESM with ocean-only (MOM6) cases. Each was run for a single month.
Notes
|
1) Cleaned up docstring for valid_diag_modes
2) Dropped valid_diag_modes from __init__.py
3) Moved imports to top of MARBL_generate_diagnostics_file.py
-- some are inside if __name__ == "__main__" block
-- I snuck in a sys.path.append() in the middle of the imports to get
MARBL_tools into the path
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.
Introduce new
diag_modeoption toMARBL_generate_diagnostics_file.py; whendiag_mode = 'none', output diagnostic file should be'never_{op}'for all variables. Whendiag_mode = 'minimal', only variables withdiag_mode = 'minimal'indiagnostics_latest.jsonhave non-never output frequencies. Whendiag_mode is 'full', variables withdiag_mode = 'minimal'or'full'will have non-never output frequencies.