From 48e9c0c60004aa7d94ed4ba2326890f9e356a89e Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Wed, 28 Feb 2024 20:59:09 -0600 Subject: [PATCH 1/4] Update performance tests with v3 low res mesh Nightly e3sm_prod_bench needs to run with production mesh. --- .../testmods_dirs/allactive/wcprod_1850_r05/README | 6 ------ .../allactive/wcprod_1850_r05/shell_commands | 3 --- .../allactive/wcprod_1850_r05/user_nl_eam | 11 ----------- .../allactive/wcprod_1850_r05/user_nl_elm | 7 ------- .../allactive/wcprod_1850_r05/user_nl_mosart | 4 ---- cime_config/tests.py | 14 ++++---------- 6 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 cime_config/testmods_dirs/allactive/wcprod_1850_r05/README delete mode 100644 cime_config/testmods_dirs/allactive/wcprod_1850_r05/shell_commands delete mode 100644 cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_eam delete mode 100644 cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm delete mode 100644 cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_mosart diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/README b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/README deleted file mode 100644 index 020bbf93e9f2..000000000000 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/README +++ /dev/null @@ -1,6 +0,0 @@ -These modifications should result in a case that has the same namelist settings as the -water cycle production sims - -Run these for at least 1 day to see all output. -Also use the CMIP6 compsets. -If running longer, change the nhtfrq for the first history file. diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/shell_commands b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/shell_commands deleted file mode 100644 index 6e8ae38ac8e9..000000000000 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/shell_commands +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -./xmlchange --append CAM_CONFIG_OPTS='-cosp' - diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_eam b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_eam deleted file mode 100644 index eeac1d647b1d..000000000000 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_eam +++ /dev/null @@ -1,11 +0,0 @@ - nhtfrq = -24,-24,-6,-6,-3,-24,-24 - mfilt = 1,30,120,120,240,30,1 - avgflag_pertape = 'A','A','I','A','A','A','I' - fexcl1 = 'CFAD_SR532_CAL', 'LINOZ_DO3', 'LINOZ_DO3_PSC', 'LINOZ_O3CLIM', 'LINOZ_O3COL', 'LINOZ_SSO3', 'hstobie_linoz' - fincl1 = 'extinct_sw_inp','extinct_lw_bnd7','extinct_lw_inp','CLD_CAL', 'TREFMNAV', 'TREFMXAV' - fincl2 = 'FLUT','PRECT','U200','V200','U850','V850','Z500','OMEGA500','UBOT','VBOT','TREFHT','TREFHTMN:M','TREFHTMX:X','QREFHT','TS','PS','TMQ','TUQ','TVQ','TOZ', 'FLDS', 'FLNS', 'FSDS', 'FSNS', 'SHFLX', 'LHFLX', 'TGCLDCWP', 'TGCLDIWP', 'TGCLDLWP', 'CLDTOT', 'T250', 'T200', 'T150', 'T100', 'T050', 'T025', 'T010', 'T005', 'T002', 'T001', 'TTOP', 'U250', 'U150', 'U100', 'U050', 'U025', 'U010', 'U005', 'U002', 'U001', 'UTOP', 'FSNT', 'FLNT' - fincl3 = 'PSL','T200','T500','U850','V850','UBOT','VBOT','TREFHT', 'Z700', 'TBOT:M' - fincl4 = 'FLUT','U200','U850','PRECT','OMEGA500' - fincl5 = 'PRECT','PRECC','TUQ','TVQ','QFLX','SHFLX','U90M','V90M' - fincl6 = 'CLDTOT_ISCCP','MEANCLDALB_ISCCP','MEANTAU_ISCCP','MEANPTOP_ISCCP','MEANTB_ISCCP','CLDTOT_CAL','CLDTOT_CAL_LIQ','CLDTOT_CAL_ICE','CLDTOT_CAL_UN','CLDHGH_CAL','CLDHGH_CAL_LIQ','CLDHGH_CAL_ICE','CLDHGH_CAL_UN','CLDMED_CAL','CLDMED_CAL_LIQ','CLDMED_CAL_ICE','CLDMED_CAL_UN','CLDLOW_CAL','CLDLOW_CAL_LIQ','CLDLOW_CAL_ICE','CLDLOW_CAL_UN' - fincl7 = 'O3', 'PS', 'TROP_P' diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm deleted file mode 100644 index 9974e1edeb95..000000000000 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm +++ /dev/null @@ -1,7 +0,0 @@ -! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) -! finidat = '${DIN_LOC_ROOT}/lnd/clm2/initdata_map/clmi.WCYCL1850.ne30pg2_r05_EC30to60E2r2.SMS_Ld1.c20230213.nc' - hist_dov2xy = .true.,.true. - hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' - hist_mfilt = 1,365 - hist_nhtfrq = -24,-24 - hist_avgflag_pertape = 'A','A' diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_mosart b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_mosart deleted file mode 100644 index b0a170bcec25..000000000000 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_mosart +++ /dev/null @@ -1,4 +0,0 @@ - rtmhist_fincl2 = 'RIVER_DISCHARGE_OVER_LAND_LIQ' - rtmhist_mfilt = 1,365 - rtmhist_ndens = 2 - rtmhist_nhtfrq = -24,-24 diff --git a/cime_config/tests.py b/cime_config/tests.py index 0c2a1bd1eb14..0f8da5750672 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -212,7 +212,7 @@ "e3sm_atm_prod" : { "tests" : ( "SMS_Ln5.ne30pg2_r05_IcoswISC30E3r5.F2010.eam-wcprod_F2010", - "SMS.ne30pg2_r05_IcoswISC30E3r5.F20TR.eam-wcprod_F20TR", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.F20TR.eam-wcprod_F20TR", ) }, @@ -291,7 +291,6 @@ "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp", "ERS_Ld3.ne4pg2_oQU480.F2010", - #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset "NCK.ne4pg2_oQU480.WCYCL1850NS", "PET.f19_g16.X.allactive-mach-pet", "PET.f45_g37_rx1.A.allactive-mach-pet", @@ -301,7 +300,6 @@ "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPECACNT_1850.elm-bgcexp", "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPRDCTC_1850.elm-bgcexp", "SMS_D_Ld3.T62_oQU120.CMPASO-IAF", - "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850", "SMS_Ln5.ne30pg2_ne30pg2.F2010-SCREAM-LR-DYAMOND2", "ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-nlmaps", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF", @@ -346,13 +344,12 @@ "e3sm_prod" : { "inherit" : "e3sm_atm_prod", "tests" : ( - "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850_r05", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-1pctCO2.allactive-wcprod_1850_1pctCO2", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-4xCO2.allactive-wcprod_1850_4xCO2", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp", "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP585.allactive-wcprodssp", - "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850", + "SMS_Ld1_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850", "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850", ) }, @@ -370,11 +367,8 @@ #e3sm performance-benching of production-like runs "e3sm_prod_bench" : { "tests" : ( - "PFS.ne30pg2_r05_oECv3.F2010.bench-noio", - "PFS.ne30pg2_r05_oECv3.F20TR.bench-noio", - "PFS.ne30pg2_r05_EC30to60E2r2.WCYCL1850.bench-noio", - "PFS.ne30pg2_EC30to60E2r2.WCYCL1850.bench-noio", - "PFS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.bench-noio", + "PFS.ne30pg2_r05_IcoswISC30E3r5.F2010.bench-noio", + "PFS.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.bench-noio", ) }, From 3d318777320e013c297af4dbb910e9929e2f661a Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Wed, 28 Feb 2024 21:09:26 -0600 Subject: [PATCH 2/4] Disable slow archiving of old tests on all ANL LCRC machines --- cime_config/machines/config_machines.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml index f3aa5cfa6149..bbaa954bfa28 100644 --- a/cime_config/machines/config_machines.xml +++ b/cime_config/machines/config_machines.xml @@ -2616,7 +2616,7 @@ $CIME_OUTPUT_ROOT/$CASE/bld 0.05 0.05 - 1000 + 0 /lcrc/group/e3sm/soft/perl/chrys/lib/perl5 $SHELL{dirname $(dirname $(which nc-config))} @@ -2698,7 +2698,7 @@ $CIME_OUTPUT_ROOT/$CASE/run $CIME_OUTPUT_ROOT/$CASE/bld 0.1 - 1000 + 0 $SHELL{dirname $(dirname $(which nc-config))} $SHELL{dirname $(dirname $(which nf-config))} @@ -2777,7 +2777,7 @@ $CIME_OUTPUT_ROOT/$CASE/run $CIME_OUTPUT_ROOT/$CASE/bld 0.1 - 1000 + 0 $SHELL{dirname $(dirname $(which nc-config))} $SHELL{dirname $(dirname $(which nf-config))} From 3b45c0b6d03e3190b5662108d8f0a650d5b89027 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Wed, 28 Feb 2024 21:12:51 -0600 Subject: [PATCH 3/4] Add 3x32x2 PEs for ne4 I-cases on Chrysalis to match test-cases --- components/elm/cime_config/config_pes.xml | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/components/elm/cime_config/config_pes.xml b/components/elm/cime_config/config_pes.xml index 86acd12be937..80a84ff7da21 100644 --- a/components/elm/cime_config/config_pes.xml +++ b/components/elm/cime_config/config_pes.xml @@ -523,4 +523,33 @@ + + + + elm on chrysalis: any compset on ne4 grid, 3x32x2 NODESxMPIxOMP + 32 + 64 + + 96 + 96 + 96 + 96 + 96 + 96 + 96 + 96 + + + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + + + + From c7a6e54ca330c7b7dbea652511699526c84f1d38 Mon Sep 17 00:00:00 2001 From: Azamat Mametjanov Date: Wed, 28 Feb 2024 21:22:04 -0600 Subject: [PATCH 4/4] Disable netcdf output --- cime_config/testmods_dirs/bench/noio/user_nl_mpaso | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/testmods_dirs/bench/noio/user_nl_mpaso b/cime_config/testmods_dirs/bench/noio/user_nl_mpaso index fcaa3656188f..046a22bb8831 100644 --- a/cime_config/testmods_dirs/bench/noio/user_nl_mpaso +++ b/cime_config/testmods_dirs/bench/noio/user_nl_mpaso @@ -6,3 +6,4 @@ config_am_timeseriesstatsmonthlymin_enable=false config_am_timeseriesstatsmonthlymax_enable=false config_am_eddyproductvariables_enable=false config_am_oceanheatcontent_enable=false +config_am_conservationcheck_enable=false