Aerosol fix #303
Merged
Aerosol fix #303
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
Add new argument in variable defaults file for constituents of variables that have changed in CAM-CHEM runs Implement check in derivation of time series files to first check if chem/aerosol constituents are in history file then check if this variable is in the list of CAM-CHEM
Change logic for checking for CAM-CHEM derived variables and also add time stamp to ADF log file name
nusbaume
approved these changes
Jun 22, 2024
|
@nusbaume Thanks for the last look over, I believe this might be all good now. |
nusbaume
approved these changes
Jun 24, 2024
There was a problem hiding this comment.
Thanks for the updates @justin-richling! Just one final change request. After that is done if all testing passes on your end then feel free to merge it in. Thanks!
lib/adf_diag.py
Outdated
Comment on lines
1128
to
1129
| if glob.glob(os.path.join(ts_dir, f"*{hist_str}*.{constit}.*.nc")): | ||
| constit_files.append(glob.glob(os.path.join(ts_dir, f"*{hist_str}*.{constit}.*"))[0]) |
There was a problem hiding this comment.
I might have a check here for when hist_str = None:
Suggested change
| if glob.glob(os.path.join(ts_dir, f"*{hist_str}*.{constit}.*.nc")): | |
| constit_files.append(glob.glob(os.path.join(ts_dir, f"*{hist_str}*.{constit}.*"))[0]) | |
| if hist_str: | |
| const_glob_str = f"*{hist_str}*.{constit}.*.nc" | |
| else: | |
| const_glob_str = f"*.{constit}.*.nc" | |
| #end if | |
| if glob.glob(os.path.join(ts_dir, const_glob_str)): | |
| constit_files.append(glob.glob(os.path.join(ts_dir, const_glob_str ))[0]) |
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.
With the update of how some variables are derived if using a CAM-CHEM run, the derivation of time series files has been updated to check first if the constituents are in the history file. If not, it checks again for the CAM-CHEM constituents based off the argument
derivable_from_cam_chemin theadf_variable_defaults.yamlfile.Additionally, this will add debugging if missing constituents to the debug log and update the CSS to force the number of plot boxes on the website from 3 to 4 on each row; 4 boxes was making the content go off page.