Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix subset_data error "no attribute 'evenly_split_cropland'" #2253

Merged
merged 61 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2dbf4ee
add xesmf to the standard python environment
glemieux Jul 27, 2023
ff5d65f
add xesmf to latest conda env file
glemieux Jul 27, 2023
01534b1
reorder xesmf in latest
glemieux Jul 27, 2023
c5590d6
regrid shdates: Set up template file within regrid_ggcmi_shdates.py r…
samsrabin Jul 28, 2023
33b5eef
regrid shdates: Flip latitude with xarray instead of ncpdq.
samsrabin Jul 28, 2023
1c2b19c
regrid shdates: Now works with surface dataset as template file.
samsrabin Jul 28, 2023
62ac2ff
regrid shdates: Move and rename coord import functions.
samsrabin Jul 28, 2023
63571ee
regrid shdates: Improved comments and descriptions.
samsrabin Jul 28, 2023
fa33f11
regrid shdates: No need to check nco utilities anymore.
samsrabin Jul 28, 2023
250bf72
process shdates: Append regrid resolution to input filename.
samsrabin Jul 28, 2023
313c01d
regrid shdates: Improved messaging.
samsrabin Jul 28, 2023
8ea2ed1
process shdates: Include regrid resolution in output filename.
samsrabin Jul 28, 2023
582c848
process/regrid shdates: Removed import of unused shutil.
samsrabin Jul 28, 2023
c8bd4c6
Reformatting with black.
samsrabin Aug 1, 2023
f7b543d
Added previous commit to .git-blame-ignore-revs.
samsrabin Aug 1, 2023
8842be8
Merge tag 'ctsm5.1.dev133' into python/xesmf-add
ekluzek Aug 10, 2023
d8525fb
Merge tag 'ctsm5.1.dev142' into regrid-shdate-dev
samsrabin Oct 6, 2023
cfe0c37
regrid_ggcmi_shdates: Add -x/--extension (default now .nc).
samsrabin Oct 6, 2023
56092ff
regrid_ggcmi_shdates: Fail if no files found.
samsrabin Oct 6, 2023
b3dcbfa
Fix misplaced if statement and end model run if no-isotope to isotope…
olyson Oct 27, 2023
800e85a
Changes to comments
olyson Nov 1, 2023
d1b7b01
Add optional -c/--crop-list arg to regrid_ggcmi_shdates.
samsrabin Nov 1, 2023
da6f274
regrid_ggcmi_shdates: Add leading . to extension if needed.
samsrabin Nov 1, 2023
3840c78
Start files for system/unit testing regrid_ggcmi_shdates.
samsrabin Nov 7, 2023
51cc972
Move import_coord_[12]d to python/ctsm/utils.py.
samsrabin Nov 7, 2023
40768c3
Use abort() instead of raise RuntimeError().
samsrabin Nov 7, 2023
96b88aa
Add unit tests for importing 2-d latitude.
samsrabin Nov 7, 2023
fdd36b3
Fix "Expected 1 dimension name containing" in import_coord_2d.
samsrabin Nov 7, 2023
04d2d73
Add unit tests for importing 1-d latitude.
samsrabin Nov 7, 2023
4d2d497
Functionize processing of regrid_ggcmi_shdates input args.
samsrabin Nov 7, 2023
4f59927
regrid_ggcmi_shdates: Use abort() instead of raise RuntimeError().
samsrabin Nov 7, 2023
414ad55
Add system test for regrid_ggcmi_shdates.
samsrabin Nov 7, 2023
183fc26
Format regrid_ggcmi_shdates tests with black.
samsrabin Nov 7, 2023
1bebd5e
Add previous commit to .git-blame-ignore-revs.
samsrabin Nov 7, 2023
025d5e7
More black reformatting.
samsrabin Nov 7, 2023
d0df912
Add previous commit to .git-blame-ignore-revs.
samsrabin Nov 7, 2023
19a97fb
Add comment in LakeHydrology() pointing to issue #2227.
samsrabin Nov 8, 2023
9e0f81c
Fix subset_data error 'no attribute evenly_split_cropland'
slevis-lmwg Nov 15, 2023
d895c6e
Updates recommended by pylint while keeping black passing
slevis-lmwg Nov 15, 2023
18c2a50
move add_cime_to_path import
Nov 28, 2023
242974b
Remove endrun for Meier2022 case to work
slevis-lmwg Nov 29, 2023
e93ae42
Merge branch 'master' into regrid-shdate-dev
samsrabin Nov 30, 2023
7222bb6
Try z0m(p) = z0mg(c) instead of zero as the bug-fix
slevis-lmwg Nov 30, 2023
ced34c3
Fix comment alignment
slevis-lmwg Nov 30, 2023
82c3f47
Merge tag 'ctsm5.1.dev155' into bugfix_iss2264
slevis-lmwg Dec 6, 2023
a18d316
Merge remote-tracking branch 'escomp/master' into subset_data_fix
slevis-lmwg Dec 8, 2023
875bb0d
Merge remote-tracking branch 'slevis-lmwg/bugfix_iss2264' into subset…
slevis-lmwg Dec 8, 2023
6168aa1
Merge remote-tracking branch 'adrifoster/run_neon-cime_path_bug' into…
slevis-lmwg Dec 8, 2023
f335221
Merge remote-tracking branch 'glemieux/python/xesmf-add' into subset_…
slevis-lmwg Dec 8, 2023
f47de1d
Merge remote-tracking branch 'samsrabin/regrid-shdate-dev' into subse…
slevis-lmwg Dec 8, 2023
167d445
Merge remote-tracking branch 'olyson/noiso2iso' into subset_data_fix
slevis-lmwg Dec 8, 2023
dc3f609
Merge remote-tracking branch 'samsrabin/refer-to-issue-2227' into sub…
slevis-lmwg Dec 8, 2023
b45d142
Merge remote-tracking branch 'escomp/master' into subset_data_fix
slevis-lmwg Dec 8, 2023
ff02bad
Add module load cdo to regrid_ggcmi_shdates.py for sys test to pass
slevis-lmwg Dec 8, 2023
bb536ed
Minor reformat
slevis-lmwg Dec 8, 2023
1aa54e6
Revert "Minor reformat"
slevis-lmwg Dec 8, 2023
868c8af
Revert "Add module load cdo to regrid_ggcmi_shdates.py for sys test t…
slevis-lmwg Dec 8, 2023
a059445
Revert "Merge remote-tracking branch 'samsrabin/regrid-shdate-dev' in…
slevis-lmwg Dec 8, 2023
1fbf551
Draft ChangeLog/ChangeSum
slevis-lmwg Dec 9, 2023
fb5dd43
Correction for one test in ExpectedTestFails.xml
slevis-lmwg Dec 11, 2023
5cd5758
Updated ChangeLog/ChangeSum
slevis-lmwg Dec 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</test>

<test name="SMS_D.f10_f10_mg37.I2000Clm51BgcCrop.derecho_nvhpc.clm-crop">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#1733</issue>
</phase>
Expand Down
71 changes: 71 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,75 @@
===============================================================
Tag name: ctsm5.1.dev159
Originator(s): multiple (slevis (Sam Levis), afoster (Adrianna Foster), erik (Erik Kluzek), wwieder (Will Wieder), glemieux (Greg Lemieux), oleson (Keith Oleson), sacks (Bill Sacks), samrabin (Sam Rabin), santos (Sean Patrick Santos))
Date: Tue 12 Dec 2023 11:10:26 AM MST
One-line Summary: Various BFB fixes and updates

Purpose and description of changes
----------------------------------
#2253 Fix subset_data error (slevis)
#2271 bfb bug-fix allowing us to make Meier2022 the default; making it
the default comes in a later tag (slevis)
#2267 Fix run_neon CIME path import (afoster, erik, wwieder)
#2075 Add xesmf to the standard python env (glemieux)
#2229 Fix misplaced if statement and end model run if no-isotope to isotope run with user_init_interp=.false. (oleson, sacks, wwieder)
#2239 Add comment in LakeHydrology (samrabin, santos)

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.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5

Bugs fixed or introduced
------------------------
CTSM issues fixed (include CTSM Issue #):
Fixes #2253
Fixes #2271
Fixes #2267
Fixes #2075
Fixes #2229
Fixes #2239

Testing summary:
----------------
[PASS means all tests PASS; OK means tests PASS other than expected fails.]

python testing (if python code has changed; see instructions in python/README.md; document testing done):

derecho - PASS

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

derecho ----- OK
izumi ------- PASS

Answer changes
--------------
Changes answers relative to baseline: NO

Other details
-------------
List any externals directories updated (cime, rtm, mosart, cism, fates, etc.):

Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/ctsm/pull/2253
https://github.com/ESCOMP/ctsm/pull/2271
https://github.com/ESCOMP/ctsm/pull/2267
https://github.com/ESCOMP/ctsm/pull/2075
https://github.com/ESCOMP/ctsm/pull/2229
https://github.com/ESCOMP/ctsm/pull/2239

===============================================================
===============================================================
Tag name: ctsm5.1.dev158
Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
Date: Thu 07 Dec 2023 10:22:46 PM MST
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.1.dev159 multiple 12/12/2023 Various BFB fixes and updates
ctsm5.1.dev158 erik 12/07/2023 First tag with testing moved to Derecho and working PE-layouts for Derecho
ctsm5.1.dev157 samrabin 12/05/2023 Update Externals to work on Derecho
ctsm5.1.dev156 samrabin 11/30/2023 Do not use Meier roughness by default.
Expand Down
4 changes: 3 additions & 1 deletion python/conda_env_ctsm_py.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ requests
packaging
numpy=1.18.5
xarray=0.17.0
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
black=22.3.0 # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows
1 change: 1 addition & 0 deletions python/conda_env_ctsm_py_latest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ scipy
netcdf4
requests
packaging
xesmf
numpy>=1.23.0
xarray>=2022.3.0
pylint>=2.8.3,<2.9.0 # Once, you move off of 2.8.3, make lint shows 2 errors, at 2.11.1 there are 2 more errors beyond that
Expand Down
Loading
Loading