From 99bd6018268a0cf75f09d6106fdd3200d66fc2bf Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 31 Jan 2024 14:55:46 -0700 Subject: [PATCH 1/6] Remove backticks from assign-to-project.yml --- .github/workflows/assign-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assign-to-project.yml b/.github/workflows/assign-to-project.yml index 8c6c259c33..c51a4a6cba 100644 --- a/.github/workflows/assign-to-project.yml +++ b/.github/workflows/assign-to-project.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest name: Assign to High Priority project steps: - - name: Assign issues and pull requests with `priority: high` label to project 25 + - name: Assign issues and pull requests with priority: high label to project 25 uses: srggrs/assign-one-project-github-action@1.3.1 if: | contains(github.event.issue.labels.*.name, 'priority: high') || From 829da767707b8e8576563411e38f5691aa9d10e5 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 1 Feb 2024 08:31:43 -0700 Subject: [PATCH 2/6] Remove a colon from assign-to-project.yml --- .github/workflows/assign-to-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assign-to-project.yml b/.github/workflows/assign-to-project.yml index c51a4a6cba..225c223bde 100644 --- a/.github/workflows/assign-to-project.yml +++ b/.github/workflows/assign-to-project.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest name: Assign to High Priority project steps: - - name: Assign issues and pull requests with priority: high label to project 25 + - name: Assign issues and pull requests with priority-high label to project 25 uses: srggrs/assign-one-project-github-action@1.3.1 if: | contains(github.event.issue.labels.*.name, 'priority: high') || From 1949f5c76897016d8d2d6de9ce93eb75cb7a1a51 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Feb 2024 16:32:39 -0700 Subject: [PATCH 3/6] Update parameter files to 240207 (delete _FillValue and history). --- bld/namelist_files/namelist_defaults_ctsm.xml | 6 +++--- .../testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm | 2 +- py_env_create | 2 +- python/conda_env_ctsm_py.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index d5d8bc08eb..e065807741 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -484,9 +484,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/ctsm51_params.c240105.nc -lnd/clm2/paramdata/clm50_params.c240105.nc -lnd/clm2/paramdata/clm45_params.c240105.nc +lnd/clm2/paramdata/ctsm51_params.c240207.nc +lnd/clm2/paramdata/clm50_params.c240207.nc +lnd/clm2/paramdata/clm45_params.c240207.nc diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm index 4e073859be..8135bddf3b 100644 --- a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm @@ -1,2 +1,2 @@ -paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240105.nc' +paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240207.nc' hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr' diff --git a/py_env_create b/py_env_create index c323a374df..a2a2bbbcb7 100755 --- a/py_env_create +++ b/py_env_create @@ -23,7 +23,7 @@ if [ $error != 0 ]; then exit -1 fi rm condahelp.txt -ctsm_python=ctsm_pylib +ctsm_python=ctsm_pylib3 condadir="$dir/python" diff --git a/python/conda_env_ctsm_py.txt b/python/conda_env_ctsm_py.txt index e621081591..e469c3e37a 100644 --- a/python/conda_env_ctsm_py.txt +++ b/python/conda_env_ctsm_py.txt @@ -18,9 +18,9 @@ scipy netcdf4 requests packaging -numpy=1.18.5 +numpy xarray=0.17.0 xesmf -numba=0.55.2 # Avoid 0.56 until numpy>=1.20. This is the minimum for xesmf +numba # Avoid 0.56 until numpy>=1.20. This is the minimum for xesmf pylint=2.8.3 black=22.3.0 # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows From 9511108ad5b5939a4b0b9f4f42946140f97800ca Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Wed, 7 Feb 2024 16:48:10 -0700 Subject: [PATCH 4/6] Revert accidental changes re: ctsm_pylib --- py_env_create | 2 +- python/conda_env_ctsm_py.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/py_env_create b/py_env_create index a2a2bbbcb7..c323a374df 100755 --- a/py_env_create +++ b/py_env_create @@ -23,7 +23,7 @@ if [ $error != 0 ]; then exit -1 fi rm condahelp.txt -ctsm_python=ctsm_pylib3 +ctsm_python=ctsm_pylib condadir="$dir/python" diff --git a/python/conda_env_ctsm_py.txt b/python/conda_env_ctsm_py.txt index e469c3e37a..e621081591 100644 --- a/python/conda_env_ctsm_py.txt +++ b/python/conda_env_ctsm_py.txt @@ -18,9 +18,9 @@ scipy netcdf4 requests packaging -numpy +numpy=1.18.5 xarray=0.17.0 xesmf -numba # Avoid 0.56 until numpy>=1.20. This is the minimum for xesmf +numba=0.55.2 # Avoid 0.56 until numpy>=1.20. This is the minimum for xesmf pylint=2.8.3 black=22.3.0 # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows From dca964c2cb939ac30e10eca11fb1310f1a5aed21 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 8 Feb 2024 11:28:28 -0700 Subject: [PATCH 5/6] Update ChangeLog and ChangeSum. --- doc/ChangeLog | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 53 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index dbb9b05c84..84787d3087 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,56 @@ =============================================================== +Tag name: ctsm5.1.dev167 +Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) +Date: Thu Feb 8 11:24:15 MST 2024 +One-line Summary: Delete _FillValue and history from parameter files + +Purpose and description of changes +---------------------------------- + +Updates parameter files to c240207. These are the same as c240105 except: +- Attribute _FillValue has been removed from all variables +- Global attributes history, history_of_appended_files, and latest_git_log have been removed + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + +CTSM issues fixed (include CTSM Issue #): +- Fixes #2347 + + +Testing summary: +---------------- + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + + +Other details +------------- + +Pull Requests that document the changes (include PR ids): +- #2350: Delete _FillValue and history from parameter files (https://github.com/ESCOMP/CTSM/pull/2350) + +=============================================================== +=============================================================== Tag name: ctsm5.1.dev166 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310), tking (Teagan King), samrabin (Sam Rabin) Date: Wed 24 Jan 2024 05:39:41 PM MST diff --git a/doc/ChangeSum b/doc/ChangeSum index bfc8b86174..d644cff144 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.1.dev167 samrabin 02/08/2024 Delete _FillValue and history from parameter files ctsm5.1.dev166 multiple 01/24/2024 BFB merge tag ctsm5.1.dev165 slevis 01/19/2024 Turn Meier2022, tillage, residue removal on for ctsm5.1, fix #2212 ctsm5.1.dev164 rgknox 01/17/2024 Compatibility and tests for FATES 2-Stream From 4d7493afd7a7a382b7eccc3b75221d28df6f4c81 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 8 Feb 2024 13:55:30 -0700 Subject: [PATCH 6/6] Use c240207b parameter files. --- bld/namelist_files/namelist_defaults_ctsm.xml | 6 +++--- .../testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm | 2 +- doc/ChangeLog | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index e065807741..d3b3cc9715 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -484,9 +484,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/ctsm51_params.c240207.nc -lnd/clm2/paramdata/clm50_params.c240207.nc -lnd/clm2/paramdata/clm45_params.c240207.nc +lnd/clm2/paramdata/ctsm51_params.c240207b.nc +lnd/clm2/paramdata/clm50_params.c240207b.nc +lnd/clm2/paramdata/clm45_params.c240207b.nc diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm index 8135bddf3b..c235d72df1 100644 --- a/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm @@ -1,2 +1,2 @@ -paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240207.nc' +paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_ciso_cwd_hr_params.c240207b.nc' hist_fincl1 = 'CWDC_HR','C13_CWDC_HR','C14_CWDC_HR','CWD_HR_L2','CWD_HR_L2_vr','CWD_HR_L3','CWD_HR_L3_vr' diff --git a/doc/ChangeLog b/doc/ChangeLog index 84787d3087..084516e23e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,13 +1,13 @@ =============================================================== Tag name: ctsm5.1.dev167 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) -Date: Thu Feb 8 11:24:15 MST 2024 +Date: Thu 08 Feb 2024 01:56:05 PM MST One-line Summary: Delete _FillValue and history from parameter files Purpose and description of changes ---------------------------------- -Updates parameter files to c240207. These are the same as c240105 except: +Updates parameter files to c240207b. These are the same as c240105 except: - Attribute _FillValue has been removed from all variables - Global attributes history, history_of_appended_files, and latest_git_log have been removed