Skip to content

Commit

Permalink
Merge pull request #731 from cacraigucar/update_alpha11a_ext
Browse files Browse the repository at this point in the history
cam6_3_088:  Update externals to match cesm2_3_alpha11a - more or less
  • Loading branch information
cacraigucar authored Dec 21, 2022
2 parents 39d4c3d + 1554dc0 commit 4e10c3b
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.47
tag = ccs_config_cesm0.0.49
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
local_path = ccs_config
Expand All @@ -21,7 +21,7 @@ externals = Externals.cfg
required = True

[cmeps]
tag = cmeps0.13.78
tag = cmeps0.14.5
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
Expand Down Expand Up @@ -64,7 +64,7 @@ local_path = libraries/parallelio
required = True

[cime]
tag = cime6.0.76
tag = cime6.0.82
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
Expand All @@ -79,7 +79,7 @@ externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm5.1.dev107
tag = ctsm5.1.dev114
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
local_path = components/clm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
./xmlchange --append CAM_CONFIG_OPTS="-carma sea_salt"
./xmlchange RUN_STARTDATE="0001-01-01"
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
./xmlchange CALENDAR=GREGORIAN
./xmlchange PIO_TYPENAME=pnetcdf
./xmlchange ATM_NCPL=48
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
./xmlchange --append CAM_CONFIG_OPTS="-usr_mech_infile \$TESTS_MODS_DIR/cam/outfrq3s_chemproc/test_mech.in"
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
./xmlchange RUN_STARTDATE=2015-01-01
./xmlchange CALENDAR=GREGORIAN
./xmlchange ROF_NCPL=\$ATM_NCPL
./xmlchange GLC_NCPL=\$ATM_NCPL
102 changes: 102 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,107 @@
===============================================================

Tag name: cam6_3_088
Originator(s): cacraig
Date: Dec 21, 2022
One-line Summary: Update externals to match cesm2_3_alpha11a - more or less

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

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Update all externals to match cesm2_3_alpha11a except for a couple externals which are newer and FMS which is older

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaumer

List all files eliminated: N/A

List all files added and what they do:
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_apmee/shell_commands
- add xmlchange commands to fix error with coupling

List all existing files that have been modified, and describe the changes:
M Externals.cfg
- update externals as described above

M cime_config/testdefs/testmods_dirs/cam/carma_sea_salt/shell_commands
M cime_config/testdefs/testmods_dirs/cam/dartcambigens/shell_commands
M cime_config/testdefs/testmods_dirs/cam/outfrq3s_chemproc/shell_commands
M cime_config/testdefs/testmods_dirs/cam/outfrq9s_mee_fluxes/shell_commands
- add xmlchange commands to fix error with coupling


If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

cheyenne/intel/aux_cam: all BFB except:
FAIL ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.F2000dev.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ld3_Vnuopc.f09_f09_mg17.FWHIST.cheyenne_intel.cam-reduced_hist1d BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Lh12_Vnuopc.f19_f19_mg17.FW4madSD.cheyenne_intel.cam-outfrq3h BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.cheyenne_intel.cam-outfrq9s_mg3 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.F1850.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.F2000climo.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.F2000dev.cheyenne_intel.cam-outfrq9s_mg3 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.F2010climo.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.FHIST_BDRD.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.f19_f19_mg17.FWsc1850.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.ne30_ne30_mg17.FCnudged.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ld3_Vnuopc.f10_f10_mg37.F1850.cheyenne_intel.cam-outfrq1d_14dec_L32wsc BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ln9_P288x1_Vnuopc.mpasa120_mpasa120.F2000climo.cheyenne_intel.cam-outfrq9s_mpasa120 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ln9_P36x1_Vnuopc.mpasa480_mpasa480.F2000climo.cheyenne_intel.cam-outfrq9s_mpasa480 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ln9_Vnuopc.f09_f09_mg17.FX2000.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ln9_Vnuopc.f19_f19_mg17.FSPCAMS.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL ERS_Ln9_Vnuopc.f19_f19_mg17.FXSD.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f09_f09_mg17.FCts2nudged.cheyenne_intel.cam-outfrq9s_leapday BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f09_f09_mg17.FCvbsxHIST.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f10_f10_mg37.FC2000mam5.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f19_f19_mg17.FWma2000climo.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_amie BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.ne16_ne16_mg17.FX2000.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc_P720x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc_P720x1.ne30pg3_ne30pg3_mg17.FCLTHIST.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_D_Ln9_Vnuopc.T42_T42.FSCAM.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ld1_Vnuopc.f09_f09_mg17.FW2000climo.cheyenne_intel.cam-outfrq1d BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ld1_Vnuopc.f19_f19.F2000dev.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ld1_Vnuopc.ne30pg3_ne30pg3_mg17.FC2010climo.cheyenne_intel.cam-outfrq1d BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Lm13_Vnuopc.f10_f10_mg37.F2000climo.cheyenne_intel.cam-outfrq1m BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ln9_Vnuopc.f09_f09_mg17.F2010climo.cheyenne_intel.cam-nudging BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ln9_Vnuopc.f09_f09_mg17.FW1850.cheyenne_intel.cam-reduced_hist3s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ln9_Vnuopc.f19_f19.F2000climo.cheyenne_intel.cam-silhs BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
FAIL SMS_Ln9_Vnuopc.f19_f19_mg17.FHIST.cheyenne_intel.cam-outfrq9s_nochem BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_087: FIELDLIST field lists differ (otherwise bit-for-bit)
- difference limited to FIELDLIST, but answers are all BFB

izumi/nag/aux_cam: all BFB except:
DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
FAIL DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae RUN time=9
PEND DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae COMPARE_base_da
- pre-existing failure

FAIL ERC_D_Ln9_Vnuopc.f10_f10_mg37.QPC5.izumi_nag.cam-carma_sea_salt NLCOMP
- namelist change due to changed coupling size

izumi/gnu/aux_cam: all BFB except:
FAIL SMS_D_Ln3_Vnuopc.f10_f10_mg37.QPMOZ.izumi_gnu.cam-outfrq3s_chemproc NLCOMP
FAIL SMS_D_Ln9_Vnuopc.f10_f10_mg37.QPWmaC4.izumi_gnu.cam-outfrq9s_apmee NLCOMP
- namelist change due to changed coupling size

FAIL SMS_P48x1_D_Ln9_Vnuopc.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s BASELINE
/fs/cgd/csm/models/atm/cam/pretag_bl/cam6_3_087_gnu: FIELDLIST field lists differ (otherwise bit-for-bit)
- difference limited to FIELDLIST, but answers are all BFB

===============================================================
===============================================================

Tag name: cam6_3_087
Originator(s): fvitt, tilmes
Date: 16 Dec 2022
Expand Down

0 comments on commit 4e10c3b

Please sign in to comment.