Update to latest version of ADF

Requires xesmf in output; also, ADF changes hist_str from h0a -> cam.h0a in time series generation so we do the same for consistency in file names
NCAR · Dec 4, 2024 · 90713d7 · 90713d7
1 parent 14192b2
commit 90713d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/environments/cupid-analysis.yml b/environments/cupid-analysis.yml
@@ -22,6 +22,7 @@ dependencies:
   - python==3.11.4
   - uxarray
   - xarray
+  - xesmf
   - yaml
   - zarr
   - pip:

diff --git a/examples/key_metrics/config.yml b/examples/key_metrics/config.yml
@@ -58,7 +58,7 @@ timeseries:
   atm:
     vars: ['PSL']
     derive_vars: []
-    hist_str: 'h0a'
+    hist_str: 'cam.h0a'
     start_years: [1,1]
     end_years: [100,100]
     level: 'lev'

diff --git a/externals/ADF b/externals/ADF
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ dependencies: @@
       - python==3.11.4
       - uxarray
       - xarray
+      - xesmf
       - yaml
       - zarr
       - pip:
@@ Expand Down @@
+105 −26		config_amwg_default_plots.yaml
+113 −33		config_cam_baseline_example.yaml
+19 −1		lib/adf_base.py
+5 −1		lib/adf_config.py
+366 −0		lib/adf_dataset.py
+742 −292		lib/adf_diag.py
+234 −38		lib/adf_info.py
+1,375 −12		lib/adf_variable_defaults.yaml
+60 −32		lib/adf_web.py
+261 −67		lib/plotting_functions.py
+22 −9		lib/test/unit_tests/test_adf_base.py
+1 −1		lib/test/unit_tests/test_adf_config.py
+1 −1		lib/website_templates/adf_diag.css
+5 −5		lib/website_templates/template.html
+19 −1		lib/website_templates/template_index.html
+7 −7		lib/website_templates/template_mean_diag.html
+11 −7		lib/website_templates/template_mean_tables.html
+10 −10		lib/website_templates/template_table.html
+14 −0		run_adf_diag
+1,277 −0		scripts/analysis/aerosol_gas_tables.py
+10 −10		scripts/analysis/amwg_table.py
+31 −8		scripts/averaging/create_climo_files.py
+756 −323		scripts/plotting/global_latlon_map.py
+276 −0		scripts/plotting/global_mean_timeseries.py
+1,272 −0		scripts/plotting/ozone_diagnostics.py
+21 −3		scripts/plotting/polar_map.py
+92 −58		scripts/plotting/tape_recorder.py
+132 −199		scripts/plotting/zonal_mean.py
+58 −9		scripts/regridding/regrid_and_vert_interp.py