-
Notifications
You must be signed in to change notification settings - Fork 383
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'azamat/benching/update-v2-grids-compsets' into next (PR #…
…4551) Update V2 benchmarking grids and compsets (in part by #4488 too): low-res F: ne30_ne30.FC5AV1C-L -> ne30pg2_EC30to60E2r2.F2010 low-res G: T62_oEC60to30v3.GMPAS-IAF > T62_EC30to60E2r2.GMPAS-IAF low-res WC: ne30_oECv3.A_WCYCL1850S_CMIP6 -> ne30pg2_EC30to60E2r2.WCYCL1850 high-res F: ne120_ne120.FC5AV1C-H01A -> ne120pg2_r05_EC30to60E2r2.F2010 high-res WC: ne120_oRRS18v3.A_WCYCL1950S_CMIP6_HR -> ne120pg2_r0125_oRRS18to6v3.WCYCL1950 [BFB]
- Loading branch information
Showing
13 changed files
with
74 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,2 @@ | ||
| #!/bin/bash | ||
| ./xmlchange --append CAM_CONFIG_OPTS='-cosp' | ||
| ./xmlchange --id BUDGETS --val TRUE | ||
|
|
||
| ./xmlchange PIO_VERSION=2 |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,2 @@ | ||
| #!/bin/bash | ||
| ./xmlchange --append CAM_CONFIG_OPTS='-cosp' | ||
| ./xmlchange --id BUDGETS --val TRUE | ||
|
|
||
| ./xmlchange PIO_VERSION=2 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| 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' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| finidat = ' ' | ||
| 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' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| rtmhist_fincl2 = 'RIVER_DISCHARGE_OVER_LAND_LIQ' | ||
| rtmhist_mfilt = 1,365 | ||
| rtmhist_ndens = 2 | ||
| rtmhist_nhtfrq = -24,-24 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
components/eam/cime_config/testdefs/testmods_dirs/eam/bench/noio/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,14 @@ | ||
| #!/bin/bash | ||
| ./xmlchange --append CAM_CONFIG_OPTS='-cosp' | ||
|
|
||
| # on KNLs, run hyper-threaded with 64x2 | ||
| if [ `./xmlquery --value MACH` == theta ]||[ `./xmlquery --value MACH` == cori-knl ]; then | ||
| ./xmlchange MAX_MPITASKS_PER_NODE=64 | ||
| ./xmlchange MAX_TASKS_PER_NODE=128 | ||
| ./xmlchange NTHRDS=2 | ||
| # avoid over-decomposing LND beyond 7688 clumps (grid cells) | ||
| if [ `./xmlquery --value NTASKS_LND` -gt 3844 ]; then ./xmlchange NTHRDS_LND=1; fi | ||
| else | ||
| ./xmlchange NTHRDS=1 | ||
| fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters