merge updates from NCAR/main#24
Conversation
Adds the MOPITT plotting script that can be called from the config yaml file.
Adds the MOPITT entry in the 'plotting_scripts' section of the cam config file, and adds CO to the list of cam variables to plot.
add requirement for xesmf
Create external scripts to break up `lib/plotting_functions` into organized helper methods
Update ADF to save Git, Conda, and config yaml info and display to webpage (if applicable)
This got moved by mistake to before the time series generation, this will break if the CVDP is reliant on time series files generated by the ADF
|
Thanks a lot, @llsuo |
|
I ran it in adf_v0.13 and it worked, and it’d be great to have it running on adf_v1.00. |
|
@llsuo , @YanchunHe - it would be great if we could update and merge this. The diff is currently 114 commits, so not much different from in January. I'm happy to help with this, if there is some way I can contribute. |
|
@TomasTorsvik Thanks very much! Could you help to run the ADF with llsuo's main branch, and test it works properly with the current NorESM3 simulation? |
|
@llsuo , @YanchunHe
Sample output is available here: |
|
Hi @tomas, which script includes this I made a test with this update, and don't find error for And with the new yaml setting, it should contains more diagnostics. Please let me know if it looks good. I will then merge soon. |
|
@YanchunHe - If you did not get any errors with call to system git during testing, it is probably something connected to my setup that is wrong. The output looks fine to me, so I think this can be merged. |
| # Gather Git info | ||
| git_info = self.get_git_info() | ||
| f.write("\n") | ||
| f.write(f"<br><br><strong><a {font_22}>Git Info</a></strong><br>") | ||
| for key,val in git_info.items(): | ||
| f.write(f"{two_space}<a {font_16}><strong>{key}:</strong> {val}</a></><br>") | ||
| f.write("</p>") |
There was a problem hiding this comment.
Here is the first use of "get_git_info()"
| # Gather Git info | ||
| git_info = self.get_git_info() | ||
| git_msg = "\nGit Info:" | ||
| msg = f"{git_msg}\n{'-' * (len(git_msg)-1)}\n" | ||
| log_msg += f"\n {msg}" | ||
|
|
||
| for key,val in git_info.items(): | ||
| log_msg += f" {key}: {val}\n" |
There was a problem hiding this comment.
And here is the second use of "get_git_info()"
|
@YanchunHe please don't mention me in this repo again |
10 participants
This PR syncs the noresm branch with the latest updates from NCAR/ADF:main (111 commits).
All merge conflicts have been resolved, with key changes in:
scripts/plotting/global_mean_timeseries.py
scripts/analysis/amwg_table.py
lib/plotting_functions.py
I verified the merged version locally by running ./run_adf_diag in my conda environment, and the diagnostics completed successfully.