merge updates from NCAR/main (#24)

* Merge adf_histogram.py from regrid_se_option branch

* first attempt to get histograms on web output

* fixing web page generation

* provide some bins for OMEGA500

* histogram debugging

* change for latlon maps, move to new branch

* fix logic for redo check

* initial fix and refactor fo polar_map.py

* remove extra print statements

* remove non-functional code

* remove another non-functional line

* Add files via upload

Adds the MOPITT plotting script that can be called from the config yaml file.

* Update config_cam_baseline_example.yaml

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.

* check for levels in the variable earlier, improve logic for pressure level plots

* refactored global_latlon_map.py; split aod special case into module

* fixed missing colon

* fixed missing newline

* fixed continue not in loop. return instead.

* fixed several more typos

* changed import for aod_latlon

* fixed defining dictionary in dataclass in aod_latlon.py

* debugging loading reference case for aod plots

* debugging loading reference case: try logic to identify reference

* debugging loading reference case: try logic to identify reference

* debugging the plot generation

* testing and debugging refactors... might be working

* add requirement for xesmf in relation to commit 17524b6

* Add ENSO analysis and plot scripts

* Update version of ADF conda env

With the change in xesmf change version number

* Update README.md for newest env version number

* Update conda environment for geocat-comp 2024.04.0

* Add support for uxarray=2025.03.0

* Update ADF conda env version number

* Docstrings added to create_climo_files.py

* Use xr.DataArray.data as arguments to np functions

Some combinations of recent versions of xarray and numpy throw a ValueError
when the first two arguments to np.linspace are DataArray objects instead of
numpy.array objects. This can be avoided by using the .data component as the
argument.

I've verified that in older numpy versions where the xarray argument is
allowed, the result from np.linspace is bit-for-bit identical whether the
argument is the DataArray or DataArray.data

* clean up unneeded imports

* updated docstrings for regrid_and_vert_interp.py

* Correct polar map issue with transform_first. Makes faster!

* log_p fix, as in PR NCAR#380

* Major fixes to the chemistry table budget

* Remove print statement

* Update global_latlon_map.py

Currently this is checking incorrectly for lat/lon dims if the variable is 3d

* Fix incorrect colorbar axis

This will fix the warning given during AOD lat/lon plots

* Keep changes in adf_variable_defaults.yaml

* Added CAMS dust burden as observational reference

* Added CAMS SEASALT aerosol burden to variable defaults

* include BURDENBC (MERRA-2); update units for BURDENs

* diff colors for BURDENPOM

* Add CALIPSO cloud fields to adf_variable_defaults.yaml

* Fix incorrect stats in vector plot

* Add files to .gitignore

* update tropopause definition

* Pull time stamp info out of if statment

Since the run info needs the same time stamp as the log file, make this happen regardless if debug is true

* Add method to collect current git info

* Add code to gather ADF run info

* Create ADF run info html page

* update html templates to add run info

* Create template_run_info.html

* Update adf_info.py

* Update adf_base.py

* Update adf_config.py

* Remove repeated argument

* Update adf_web.py

* Update adf_web.py

* Update adf_web.py

* Update title of run info webpage

* Bring in CVDP as external package

* Remove personal additions from .gitignore based on review

* fixed minor edits in review

* Make `cvdp_dir` an absolute path for use in `CUPiD`

* Move logic of ADF run info to `adf_web.py`

* Create new script for ADF-wide utlity methods

* Create new script for plotting utility methods

* Clean up script to include mostly plotting schemes only

* Update all scripts to new utility method calls

* Update all scripts to new utility method calls

* Remove unnecessary import

* Clean up code and revert to current ADF methods

* Clean up code and bring up to current ADF methods

* Update doc strings

* Update doc strings

* Revert erroneous change

* Clean up doc string

* Update webpage titles

* Remove print statments and update webpage title

* Update conda tag to match newest ADF tag

* Update conda environment prefix to v1.0.0

* Update `README.md` for newest conda env tag

* Reorder CVDP call in run_adf_diag

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

* Use path for ADF_obs compatible for both nird login and ipcc nodes

* Use extended diagnostic recipes by default for NorESM

---------

Co-authored-by: Brian Medeiros <brianpm@ucar.edu>
Co-authored-by: Brian Medeiros <brianpm@users.noreply.github.com>
Co-authored-by: Brian Medeiros <skymath@gmail.com>
Co-authored-by: shawnusaf <84995386+shawnusaf@users.noreply.github.com>
Co-authored-by: He Yanchun <yanchun.ho@gmail.com>
Co-authored-by: justin-richling <56696811+justin-richling@users.noreply.github.com>
Co-authored-by: Meg Fowler <mdfowler@ucar.edu>
Co-authored-by: Tomas Torsvik <tomas.torsvik.work@gmail.com>
Co-authored-by: Michael Levy <mike.levy.work@gmail.com>
Co-authored-by: Behrooz-Roozitalab <behrooz.roozitalab@gmail.com>
Co-authored-by: justin-richling <richling@ucar.edu>
Co-authored-by: Yanchun He <1725351+YanchunHe@users.noreply.github.com>

Author: 9 people

.gitignore

@@ -109,4 +109,7 @@ GitHub.sublime-settings
 !.vscode/tasks.json 
 !.vscode/launch.json 
 !.vscode/extensions.json 
-.history
+.history
+
+
+

README.md

@@ -40,7 +40,7 @@ If you are using conda on a non-CISL machine, then you can create and activate t
 
 ```
 conda env create -f env/conda_environment.yaml
-conda activate adf_v0.13
+conda activate adf_v1.0.0
 ```
 
 Also, along with these python requirements, the `ncrcat` NetCDF Operator (NCO) is also needed.  On the CISL machines this can be loaded by simply running:

config_cam_baseline_example.yaml

@@ -481,6 +481,7 @@ plotting_scripts:
     - cam_taylor_diagram
     - qbo
     - ozone_diagnostics
+    - MOPITT
     #- tape_recorder
     #- tem
     #- regional_map_multicase #To use this please un-comment and fill-out
@@ -506,6 +507,7 @@ diag_var_list:
     - FLNT
     - LANDFRAC
     - O3
+    - CO
 
 #<Add more variables here.>
 # MDTF recommended variables