cam6_3_056: Update externals to support CICE6 #581

peverwhee · 2022-04-22T21:16:14Z

Updates

Externals.cfg updated to match externals in cesm2_3_alpha09a (EXCEPT: CMEPS and CDEPS have more recent tags with nuopc-related fixes. Also, ccs_config_cesm has a later tag to support GPUs and fix CICE6-related error)
testlist_cam.xml updated to use longnames for MCT tests of the following compsets (the ones that have a CICE component; CICE6 does not have a NUOPC cap, so we have to explicitly use CICE5 for these tests): F2000climo, FHIST, FSCAM, FW1850

Testing

There are baseline and namelist changes due to the Externals changes but otherwise the only failing test is the existing DAE failure

closes #565
closes #512
closes #566
closes #573
closes #577
closes #583
closes #532
closes #559

Update cam_development branch

modified: Externals.cfg

modified: cime_config/testdefs/testlist_cam.xml new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands renamed: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_cam -> cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_cam renamed: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/user_nl_clm -> cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/user_nl_clm renamed: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_casper/shell_commands -> cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_cam new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/user_nl_clm new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_cam new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/user_nl_clm new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_cam new file: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/user_nl_clm

modified: test/system/test_driver.sh

cime_config/testdefs/testlist_cam.xml

cacraigucar · 2022-04-22T21:24:16Z

Externals.cfg

@@ -1,24 +1,24 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.18
+tag = ccs_config_cesm0.0.21


The GPU PR (#577) has this going to 23. Could that be a possibility for this PR?

Yes indeed! I'll run a few tests to make sure it doesn't break anything crazy.

updating to ccs_config_cesm0.0.23 did not break anything

gold2718

Just a few notes on the ChangeLog

gold2718 · 2022-04-22T21:42:24Z

doc/ChangeLog

+Originator(s): peverwhee
+Date:
+One-line Summary: Update externals to match cesm2_3_alpha09a tag
+Github PR URL:


Suggested change

Github PR URL:

Github PR URL: https://github.com/ESCOMP/CAM/pull/581

gold2718 · 2022-04-22T21:43:24Z

doc/ChangeLog

+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+- Update to cesm2_3_alpha09a externals (https://github.com/ESCOMP/CAM/issues/565)
+
+Describe any changes made to build system:


To make sure you are not skipping anything, please label each section with no changes with an NA (or some other indication). For example:

Suggested change

Describe any changes made to build system:

Describe any changes made to build system: NA

gold2718 · 2022-04-22T21:44:19Z

doc/ChangeLog

+List all existing files that have been modified, and describe the changes:
+M       Externals.cfg
+	- update to match cesm2_3_alpha09a tag:
+	  - EXCEPTIONS: CMEPS and CDEPS have more recent tags than the alpha tag due to nuopc issues


Add an exception for ccs_config_cesm if the update to 0.0.23 works.

gold2718 · 2022-04-22T21:45:02Z

doc/ChangeLog

+	- update to match cesm2_3_alpha09a tag:
+	  - EXCEPTIONS: CMEPS and CDEPS have more recent tags than the alpha tag due to nuopc issues
+M	cime_config/testdefs/testlist_cam.xml
+	- use longname for compsets tested with MCT that use CICE since CICE6 doesn't have a nuopc cap:


I think you mean mct.

Suggested change

- use longname for compsets tested with MCT that use CICE since CICE6 doesn't have a nuopc cap:

- use longname for compsets tested with MCT that use CICE since CICE6 doesn't have an mct cap:

indeed i did. Fixed.

modified: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg2_default/shell_commands modified: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_default/shell_commands modified: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_nondefault/shell_commands modified: cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3_pcols1536/shell_commands

nusbaume

Looks good to me!

cacraigucar · 2022-04-29T17:13:22Z

@peverwhee - Has this tag morphed into matching cesm2_3_alpha09b? If so, please rename the title.

peverwhee · 2022-04-29T18:13:15Z

@cacraigucar I don't believe so. It definitely is closer to what alpha09b will likely be, but I don't think the updates for 09b are set in stone yet?

cacraigucar · 2022-04-29T18:21:47Z

@peverwhee - Perhaps since it may not match either external, we just change the title to be something like "Update externals to support CICE6"?

fischer-ncar · 2022-04-29T18:23:05Z

alpha09b isn't set in stone yet. But the biggest change in alpha09b is the python package reorganization in cime6.0.17.
I think the other plan for alpha09b is to get scam working. So in the end, this may end up matching alpha9b. Or maybe
alpha09b will look like cam6_3_056.

cacraigucar

Just confirming... The only test which is now currently failing is the DAE test which has been failing for quite some time, correct?

peverwhee · 2022-04-29T23:18:45Z

@cacraigucar That is correct. I have updated the PR description accordingly.

Merge pull request ESCOMP#581 from peverwhee/cice_updates

Mariana Vertenstein and others added 8 commits April 13, 2022 09:00

changes to fix scam - also need a cmeps update

df15ce1

Merge pull request #8 from ESCOMP/cam_development

662d158

Update cam_development branch

Update CICE/CIME/CCS_CONFIG to make ERP run work properly

be19d5a

modified: Externals.cfg

Update the test_driver for Casper

8586311

modified: test/system/test_driver.sh

update externals

9c9e41d

use longname for mct/cice5 tests

8b6825d

initial changelog updates

bee63bd

peverwhee requested review from gold2718, cacraigucar and nusbaume April 22, 2022 21:16

peverwhee added this to the CAM7dev milestone Apr 22, 2022

peverwhee self-assigned this Apr 22, 2022

cacraigucar reviewed Apr 22, 2022

View reviewed changes

gold2718 approved these changes Apr 22, 2022

View reviewed changes

cacraigucar changed the title ~~Update externals to match cesm2_3_alpha09a tag~~ cam6_3_056: Update externals to match cesm2_3_alpha09a tag Apr 22, 2022

nusbaume approved these changes Apr 25, 2022

View reviewed changes

update ccs_config external

c0280a5

cacraigucar changed the title ~~cam6_3_056: Update externals to match cesm2_3_alpha09a tag~~ Update externals to match cesm2_3_alpha09a tag Apr 25, 2022

Mariana Vertenstein and others added 6 commits April 26, 2022 10:08

scam fixes

41b1f87

update cice and ccs_config externals; add testing to changelog

db52a52

fixes for SCT test

650f838

updated ccs_config

a9aaf04

add updates for ESCOMP#573, ESCOMP#577, ESCOMP#566

0cd1d89

fixes for aquaplanet/SCAM

0fa9899

cacraigucar changed the title ~~Update externals to match cesm2_3_alpha09a tag~~ cam6_3_056: Update externals to match cesm2_3_alpha09a tag Apr 29, 2022

peverwhee changed the title ~~cam6_3_056: Update externals to match cesm2_3_alpha09a tag~~ cam6_3_056: Update externals to support CICE6 Apr 29, 2022

Courtney Peverley added 2 commits April 29, 2022 14:33

update externals; remove redundant mct tests

193682f

update Makefile to point to new genf90 location

320dc62

cacraigucar approved these changes Apr 29, 2022

View reviewed changes

peverwhee merged commit 47ffbf2 into ESCOMP:cam_development Apr 30, 2022

peverwhee mentioned this pull request Apr 30, 2022

part of cam6_3_056: PUMAS GPU regression test suite #577

Closed

cacraigucar added a commit to cacraigucar/CAM that referenced this pull request May 2, 2022

Merge tag 'cam6_3_056' into cam6_rm_pack

0688991

Merge pull request ESCOMP#581 from peverwhee/cice_updates

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cam6_3_056: Update externals to support CICE6 #581

cam6_3_056: Update externals to support CICE6 #581

peverwhee commented Apr 22, 2022 •

edited

Loading

cacraigucar Apr 22, 2022

peverwhee Apr 22, 2022

peverwhee Apr 25, 2022

gold2718 left a comment

gold2718 Apr 22, 2022

peverwhee Apr 25, 2022

gold2718 Apr 22, 2022

peverwhee Apr 25, 2022

gold2718 Apr 22, 2022

peverwhee Apr 25, 2022

gold2718 Apr 22, 2022

peverwhee Apr 25, 2022

nusbaume left a comment

cacraigucar commented Apr 29, 2022

peverwhee commented Apr 29, 2022

cacraigucar commented Apr 29, 2022

fischer-ncar commented Apr 29, 2022

cacraigucar left a comment

peverwhee commented Apr 29, 2022

	Github PR URL:
	Github PR URL: https://github.com/ESCOMP/CAM/pull/581

	Describe any changes made to build system:
	Describe any changes made to build system: NA

	- use longname for compsets tested with MCT that use CICE since CICE6 doesn't have a nuopc cap:
	- use longname for compsets tested with MCT that use CICE since CICE6 doesn't have an mct cap:

cam6_3_056: Update externals to support CICE6 #581

cam6_3_056: Update externals to support CICE6 #581

Conversation

peverwhee commented Apr 22, 2022 • edited Loading

Updates

Testing

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gold2718 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nusbaume left a comment

Choose a reason for hiding this comment

cacraigucar commented Apr 29, 2022

peverwhee commented Apr 29, 2022

cacraigucar commented Apr 29, 2022

fischer-ncar commented Apr 29, 2022

cacraigucar left a comment

Choose a reason for hiding this comment

peverwhee commented Apr 29, 2022

peverwhee commented Apr 22, 2022 •

edited

Loading