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.

Sign up for GitHub

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

Jump to bottom

Merge b4bdev 20240321 #2431

Merged
merged 34 commits into from
Mar 21, 2024
Merged

Merge b4bdev 20240321 #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ac03cbc
Fix misplaced stopf
olyson Feb 11, 2024
2744f79
working version of refactoring
TeaganKing Feb 13, 2024
68f6957
extended functions
TeaganKing Feb 13, 2024
f48bb75
fix argument errors
TeaganKing Feb 13, 2024
e7d1505
fix FATES being listed as a valid neon site...
TeaganKing Feb 13, 2024
faa18ab
todo update
TeaganKing Feb 13, 2024
90a0d78
Remove references to mct in LILAC
billsacks Feb 16, 2024
80568e2
Remove references to mct in unit tests
billsacks Feb 16, 2024
d7652f6
Merge remote-tracking branch 'escomp/b4b-dev' into towerclass
TeaganKing Feb 23, 2024
fed0836
updates from Erik's comments
TeaganKing Feb 23, 2024
1352326
fix for cray compiler format issue
jedwards4b Feb 28, 2024
e58cc39
Save the current directory at setup and return to it before deleting …
ekluzek Mar 7, 2024
88f170f
Merge remote-tracking branch 'escomp/b4b-dev' into towerclass
ekluzek Mar 7, 2024
78d0596
Black update
ekluzek Mar 7, 2024
72d2944
Add black commit to git-blame file
ekluzek Mar 7, 2024
54ccdff
Merge tag 'ctsm5.1.dev172' into merge-master-20240313
ekluzek Mar 13, 2024
fb556df
Merge pull request #2421 from ekluzek/merge-master-20240313
ekluzek Mar 13, 2024
ebdb103
Merge pull request #2391 from jedwards4b/clm5.1.dev142/cray17fix
samsrabin Mar 14, 2024
fa513f3
Merge remote-tracking branch 'escomp/b4b-dev' into lilac_remove_mct
ekluzek Mar 18, 2024
9d70347
Merge pull request #2374 from billsacks/lilac_remove_mct
ekluzek Mar 19, 2024
410a9b3
Merge remote-tracking branch 'escomp/b4b-dev' into towerclass
ekluzek Mar 19, 2024
5150c50
Don't run stest in the python Makefile, add a note to run it by hand,…
ekluzek Mar 19, 2024
d866132
Merge pull request #2363 from TeaganKing/towerclass
ekluzek Mar 19, 2024
7e4c034
Merge branch 'b4b-dev' into stopf
ekluzek Mar 19, 2024
d2b175d
Merge pull request #2358 from olyson/stopf
ekluzek Mar 20, 2024
aaf8571
Increase PE layout size for ne30 so that ZenderSource #1967 ERP test …
ekluzek Mar 20, 2024
c5c8f40
Update 4x5, ne16 and mpasa pe layouts based on it working for zenders…
ekluzek Mar 20, 2024
749890a
hcru, mpasa, and mpasa15 pe layouts
ekluzek Mar 20, 2024
0bba103
Merge remote-tracking branch 'escomp/b4b-dev' into pelayoutsupdate
ekluzek Mar 20, 2024
9732993
Explicit PE layouts for: 480, 120, and 60
ekluzek Mar 20, 2024
d2dea27
Merge pull request #2429 from ekluzek/pelayoutsupdate
ekluzek Mar 21, 2024
b6e93a2
Merge commit 'f4488859b5256dd716b833feb07150bc5a12fa2b' into merge-b4…
slevis-lmwg Mar 21, 2024
f64ba14
Draft ChangeLog/ChangeSum
slevis-lmwg Mar 21, 2024
109c444
Updated ChangeLog
slevis-lmwg Mar 21, 2024
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
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ d866510188d26d51bcd6d37239283db690af7e82
183fc26a6691bbdf87f515dc47924a64be3ced9b
6fccf682eaf718615407d9bacdd3903b8786a03d
2500534eb0a83cc3aff94b30fb62e915054030bf
78d05967c2b027dc9776a884716597db6ef7f57c
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ unit_test_build
/tools/site_and_regional/????.ad/
/tools/site_and_regional/????.postad/
/tools/site_and_regional/????.transient/
/tools/site_and_regional/archive/

# build output
*.o
Expand Down
4 changes: 2 additions & 2 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ def buildnml(case, caseroot, compname):
or clm_usrdat_name is "NEON.PRISM"
):
logger.warning(
"WARNING: Do you have approriprate initial conditions for this simulation?"
+ " Check that the finidat file used in the lnd_in namelist is apprporiately spunup for your case"
"WARNING: Do you have appropriate initial conditions for this simulation?"
+ " Check that the finidat file used in the lnd_in namelist is appropriately spunup for your case"
)

if comp_atm != "datm":
Expand Down
254 changes: 240 additions & 14 deletions cime_config/config_pes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-1</ntasks_lnd>
<ntasks_rof>-1</ntasks_rof>
<ntasks_ice>-1</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-1</ntasks_wav>
<ntasks_cpl>-1</ntasks_cpl>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-4</ntasks_ocn>
<ntasks_glc>-4</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -631,6 +631,43 @@
</pes>
</mach>
</grid>
<grid name="l%360x720">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-21</ntasks_lnd>
<ntasks_rof>-21</ntasks_rof>
<ntasks_ice>-21</ntasks_ice>
<ntasks_ocn>-21</ntasks_ocn>
<ntasks_glc>-21</ntasks_glc>
<ntasks_wav>-21</ntasks_wav>
<ntasks_cpl>-21</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%0.47x0.63" >
<mach name="any">
<pes pesize="any" compset="any">
Expand Down Expand Up @@ -742,19 +779,56 @@
</pes>
</mach>
</grid>
<grid name="l%ne16" >
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%ne30" >
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-5</ntasks_lnd>
<ntasks_rof>-5</ntasks_rof>
<ntasks_ice>-5</ntasks_ice>
<ntasks_ocn>-5</ntasks_ocn>
<ntasks_glc>-5</ntasks_glc>
<ntasks_wav>-5</ntasks_wav>
<ntasks_cpl>-5</ntasks_cpl>
<ntasks_lnd>-12</ntasks_lnd>
<ntasks_rof>-12</ntasks_rof>
<ntasks_ice>-12</ntasks_ice>
<ntasks_ocn>-12</ntasks_ocn>
<ntasks_glc>-12</ntasks_glc>
<ntasks_wav>-12</ntasks_wav>
<ntasks_cpl>-12</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -1560,6 +1634,158 @@
</pes>
</mach>
</grid>
<grid name="l%mpasa480">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-4</ntasks_ocn>
<ntasks_glc>-4</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
<ntasks_lnd>-4</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa120">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
<ntasks_lnd>-8</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa60">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-12</ntasks_lnd>
<ntasks_rof>-12</ntasks_rof>
<ntasks_ice>-12</ntasks_ice>
<ntasks_ocn>-12</ntasks_ocn>
<ntasks_glc>-12</ntasks_glc>
<ntasks_wav>-12</ntasks_wav>
<ntasks_cpl>-12</ntasks_cpl>
<ntasks_lnd>-12</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-36</ntasks_lnd>
<ntasks_rof>-36</ntasks_rof>
<ntasks_ice>-36</ntasks_ice>
<ntasks_ocn>-36</ntasks_ocn>
<ntasks_glc>-36</ntasks_glc>
<ntasks_wav>-36</ntasks_wav>
<ntasks_cpl>-36</ntasks_cpl>
<ntasks_lnd>-36</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%0.125nldas2">
<mach name="any">
<pes pesize="any" compset="any">
Expand Down
61 changes: 61 additions & 0 deletions doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,65 @@
===============================================================
Tag name: ctsm5.1.dev175
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 21 Mar 2024 05:49:04 PM MDT
One-line Summary: merge-b4bdev-20240321

Purpose and description of changes
----------------------------------

Merge master 20240313 #2421 (Update of externals to what's expected in cesm2_3_beta17)
Fix for cray compiler format issue #2391
Remove LILAC references to mct #2374
Refactoring of neon_site into tower_site and neon_site #2363
Fix misplaced stopf in CNDriverMod.F90 #2358
Update some PE layouts on Derecho #2429

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
----------
CTSM issues fixed (include CTSM Issue #):
Listed in Purpose and Description above

Testing summary:
----------------

[PASS means all tests PASS; OK means tests PASS other than expected fails.]

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

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

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

Other details
-------------
List any externals directories updated (cime, rtm, mosart, cism, fates, etc.):
See #2421 for update of externals to what's expected in cesm2_3_beta17

Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/ctsm/pull/2431

===============================================================
===============================================================
Tag name: ctsm5.1.dev174
Originator(s): olyson (Keith Oleson,UCAR/TSS)
Date: Thu 14 Mar 2024 04:56:37 PM MDT
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.1.dev175 slevis 03/21/2024 merge-b4bdev-20240321
ctsm5.1.dev174 olyson 03/14/2024 Improve vegetation health at high latitudes
ctsm5.1.dev173 rgknox 03/13/2024 New FATES namelist variable: fates_history_dimlevel
ctsm5.1.dev172 erik 03/12/2024 Merge b4b-dev
Expand Down
Loading
Loading