update for 2.12.0rc1 (#807)

* update for 2.11.0

* bump to 2.12.0rc1

README.md

@@ -50,8 +50,7 @@ E3SM Diags is modeled after the National Center for Atmospheric Research (NCAR)
 ### New Feature added during v2 development
 | Feature name <br />(set name) | Brief Introduction                                                                                                                                                                                     | Developers Contributors*                                                                                                                    | Released version |
 |--- | ---------------- | --- | --- |
-| Wavenumber frequency analysis (tropical_subseasonal) 		| The wavenumber frequency analysis (Wheeler-Kiladis Diagram) for Tropical subseasonal analysis 													 | Jim Benedict, Brian Medeiros, Jill Zhang, Tom Vo     | 2.11.0
-
+| Wavenumber frequency analysis (tropical_subseasonal) 		| The wavenumber frequency analysis (Wheeler-Kiladis Diagram) for Tropical subseasonal analysis 													 | Jim Benedict, Brian Medeiros, Jill Zhang, Tom Vo     | 2.12.0
 | T5050 diagnostic /Mixed phase partition (mp_partition)        | Temperature at which cloud top is 50% ice, 50% liquid, following McCoy et al. (2015).                                                                                                                  | Yuying Zhang, Jill Zhang, Jiwen Fan, Yunpeng Shan                                                                                                                  | 2.9.0            |
 | ARM diagnostics v3 (arm_diags)                               | Enhanced ARM diagnostics with new aerosol-cloud-interaction and aerosol activation metrics                                                                                                             | Xiaojian Zheng, Jill Zhang, Cheng Tao, Shaocheng Xie                                                                                                                              | 2.9.0            |
 | Aerosol budget diagnostics (aerosol_budget)                  | Global mean burdens, source/sink budgets and lifetimes for aerosol species.                                                                                                                            | Jill Zhang, Susannah Burrows, Naser Mahfouz, Tom Vo, Kai Zhang, Taufiq Hassan Mozumder, Xue Zheng, Ziming Ke, Yan Feng, Manish Shrivastava, Hailong Wang, Mingxuan Wu | 2.8.0            |

e3sm_diags/__init__.py

@@ -6,7 +6,7 @@
 # issue with dask when using ESMF with system compilers.
 import shapely
 
-__version__ = "v2.11.0"
+__version__ = "v2.12.0rc1"
 INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/")
 
 # Disable MPI in cdms2, which is not currently supported by E3SM-unified

examples/use_zppy_to_run_e3sm_diags/zppy_config_for_complete_e3sm_diags_run_on_NERSC.cfg

@@ -5,16 +5,16 @@ environment_commands = "source /global/common/software/e3sm/anaconda_envs/load_l
 input = "/global/cfs/cdirs/e3smpub/E3SM_simulations/v2.LR.historical_0101"
 input_subdir = archive/atm/hist
 mapping_file = "/global/homes/z/zender/data/maps/map_ne30pg2_to_cmip6_180x360_aave.20200201.nc"
-output = "/global/cfs/cdirs/e3sm/chengzhu/e3sm_diags_zppy_test_complete_run_output/v2.LR.historical_0101_20240130"
+output = "/global/cfs/cdirs/e3sm/chengzhu/e3sm_diags_zppy_test_complete_run_output/v2.LR.historical_0101_20240413"
 constraint = "cpu"
 partition = ""
 qos = "regular"
-www = "/global/cfs/cdirs/e3sm/www/chengzhu/e3sm_diags_zppy_test_complete_run_www_20240130"
+www = "/global/cfs/cdirs/e3sm/www/chengzhu/e3sm_diags_zppy_test_complete_run_www_20240413"
 
 [climo]
 active = True
 walltime = "00:30:00"
-years = "1985:2014:30",
+years = "2000:2014:15",
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
@@ -28,7 +28,7 @@ years = "1985:2014:30",
 [ts]
 active = True
 walltime = "00:30:00"
-years = "1985:2014:30",
+years = "2000:2014:15",
 
   [[ atm_monthly_180x360_aave ]]
   frequency = "monthly"
@@ -40,8 +40,13 @@ years = "1985:2014:30",
   input_files = "eam.h0"
   input_subdir = "archive/atm/hist"
   mapping_file = "glb"
-  years = "1985:2014:30",
+  years = "2000:2014:15",
 
+  [[ atm_daily_180x360_aave ]]
+  frequency = "daily"
+  input_files = "eam.h1"
+  input_subdir = "archive/atm/hist"
+  vars = "PRECT,FLUT,U850"
 
   [[ rof_monthly ]]
   extra_vars = 'areatotal2'
@@ -62,13 +67,14 @@ active = True
 grid = '180x360_aave'
 obs_ts = "/global/cfs/cdirs/e3sm/diagnostics/observations/Atm/time-series/"
 ref_final_yr = 2014
-ref_start_yr = 1985
+ref_start_yr = 2000
 reference_data_path = "/global/cfs/cdirs/e3sm/diagnostics/observations/Atm/climatology/"
-sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere","aerosol_aeronet", 
+sets = "lat_lon","zonal_mean_xy","zonal_mean_2d","polar","cosp_histogram","meridional_mean_2d","enso_diags","qbo","diurnal_cycle","annual_cycle_zonal_mean","streamflow", "zonal_mean_2d_stratosphere","aerosol_aeronet","aerosol_budget","tropical_subseasonal",
 short_name = 'v2.LR.historical_0101'
-ts_num_years = 30
+ts_num_years = 15
 walltime = "00:30:00"
-years = "1985:2014:30",
+years = "2000:2014:15",
+environment_commands = "source /global/cfs/cdirs/e3sm/zhang40/miniconda3/etc/profile.d/conda.sh; conda activate edv2110"
 
   [[ atm_monthly_180x360_aave ]]
   climo_diurnal_frequency = "diurnal_8xdaily"
@@ -79,11 +85,11 @@ years = "1985:2014:30",
 [global_time_series]
 active = True
 atmosphere_only = True # Available in E3SM Unified 1.5.1
-years = "1985-2014",
-ts_num_years = 30
+years = "2000-2014",
+ts_num_years = 15
 figstr= "v2_historical_0101"
 # moc_file needed for ocean component
 moc_file = "mocTimeSeries_1870-2014.nc"
 experiment_name = "v2.LR.historical_0101"
-ts_years = "1985-2014",
-climo_years = "1985-2014",
+ts_years = "2000-2014",
+climo_years = "2000-2014",

setup.py

@@ -157,7 +157,7 @@ def get_all_files_in_dir(directory, pattern):
         "Programming Language :: Python :: 3.10",
     ],
     name="e3sm_diags",
-    version="2.11.0",
+    version="2.12.0rc1",
     author="Chengzhu (Jill) Zhang, Tom Vo, Ryan Forsyth, Chris Golaz and Zeshawn Shaheen",
     author_email="[email protected]",
     description="E3SM Diagnostics",

tbump.toml

@@ -2,7 +2,7 @@
 github_url = "https://github.com/E3SM-Project/e3sm_diags"
 
 [version]
-current = "2.11.0"
+current = "2.12.0rc1"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before