8000 Jgfouca/branch for acme split 2018 08 08 by jgfouca · Pull Request #2743 · ESMCI/cime · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Jgfouca/branch for acme split 2018 08 08 #2743

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

Merged
merged 82 commits into from
Aug 8, 2018
Merged

Jgfouca/branch for acme split 2018 08 08 #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
6b17573
Fixes creation of coupler history filename
May 2, 2018
3853dee
Replace dots in branch name with underscores
jgfouca Apr 25, 2018
3cefbb5
Take out slashes too
jgfouca Apr 25, 2018
fe872c3
Merge branch 'bishtgautam/cime/mct-bugfix' (PR #2317)
rljacob May 21, 2018
f5dc00f
Ignore unicode chars from command output
jgfouca May 31, 2018
858887a
Update module versions for edison after maintenance.
ndkeen May 31, 2018
614a91a
Add evn setting to edison to disable HD5 check
rljacob Jun 18, 2018
be0aae3
Vectorize loops in coupler attr-vector multiplications
amametjanov Jun 21, 2018
62857bb
use shr_reprosum_calc in seq_diag_avect_mct
worleyph Jun 23, 2018
e920874
Add option to allow INF or NaN summands in shr_reprosum_calc
worleyph Jun 23, 2018
440db83
Minor cleanup
amametjanov Jun 28, 2018
3bffe68
Update E3SM config_compilers.xml to V2
jgfouca Jun 8, 2018
e2ba026
Remove pop support
jgfouca Jun 11, 2018
7953a53
Cannot use $NETCDF_PATH unless it is defined in the block
jgfouca Jun 11, 2018
6a85d5c
Fix up titan
jgfouca Jun 13, 2018
c163008
Fixups for PNETCDF
jgfouca Jun 13, 2018
35137b3
Remove dupes
jgfouca Jun 13, 2018
11ee135
Fix domain specification for T42
brhillman Jul 3, 2018
f91303d
For all 3 NERSC machines (cori-knl, cori-haswell,edison), update the …
ndkeen Jul 4, 2018
feefcb0
CIME scripts changes to support ne4_oQU480 and T62_oQU480 configurations
jonbob Jul 5, 2018
e990647
Adds a SMS land test for a BGC compset
Jul 9, 2018
1065c0f
Merge branch 'master' into jgfouca/cime/update_compilers_to_v2
jgfouca Jul 9, 2018
1a0417d
Fix qopenmp issues, remove old intel specs
jgfouca Jul 9, 2018
4cce389
Add system workload provenance capture on Summit
worleyph Jul 11, 2018
c1e4e78
Enable job progress monitoring on Summit
worleyph Jul 11, 2018
feae9a4
Merge branch E3SM-Project/ndk/machinefiles/nersc-netcdf-hdf-version-u…
ndkeen Jul 12, 2018
f90a16e
Update CIME to ESMCI cime5.7.0-3 (#2437)
jgfouca Jul 12, 2018
98ee333
Merge branch 'master' into jgfouca/cime/update_compilers_to_v2
jgfouca Jul 12, 2018
ea3bdad
Corrects the simulation length of FC5AV1C-L test
Jul 13, 2018
ce709f4
Fix test_status determination of overall test status
jgfouca Jul 13, 2018
35331ca
Update module versions for Cori (haswell and KNL) after software main…
ndkeen Jul 13, 2018
00525c0
Replace MPASSI with MPASCICE for all PE layouts (only affects NERSC m…
ndkeen Jul 13, 2018
42c6f7c
Merge branch 'brhillman/cime/fix-t42-domains' (PR #2423)
rljacob Jul 13, 2018
9e3a387
Merge branch 'azamat/cpl/simd-seq-map-avNorm' (PR #2406)
rljacob Jul 13, 2018
a8f0eaf
Change e3sm_integration NCK.ne4_... test to ne11
Jul 13, 2018
9399555
Merge branch 'bishtgautam/lnd/adds-test-for-cnpecacnt' (PR #2433)
jqyin Jul 16, 2018
22267fb
Merge branch 'worleyph/cime/summit_perf_archive' (PR #2434)
minxu74 Jul 16, 2018
ab29298
Merge branch 'jhkennedy/sea-ice/NCK-test-fix-2444' into master (PR #2…
jgfouca Jul 16, 2018
32e6a48
Merge branch 'jgfouca/cime/update_compilers_to_v2' (PR #2391)
jgfouca Jul 16, 2018
769b42e
Merge branch 'worleyph/cime/repro_in_cpldiag' (PR #2407)
rljacob Jul 16, 2018
3bb9ac7
Merge branch E3SM-Project/ndk/machinefiles/cori-maint-jul12-2018 (PR …
ndkeen Jul 16, 2018
0aa4eaa
Merge branch 'jonbob/add-qu480-configurations' (PR #2426)
jonbob Jul 17, 2018
b96c375
Merge branch E3SM-Project/ndk/machinefiles/pelayout-rm-MPASSI (PR #2443)
ndkeen Jul 17, 2018
92f6305
Add no run capability to wait_for_tests
jgfouca Jul 17, 2018
9da17f9
Remove pdb statement
jgfouca Jul 17, 2018
9ed3eed
MKL Bug fix: Update Intel compiler version
sarats Jul 18, 2018
c1d281d
configurations to build on blake and white, Skylake and P100 testbeds…
mfdeakin-sandia Jul 19, 2018
2543fed
Fix to the CIME makefile for building with separate netcdf-c and netc…
mfdeakin-sandia Jul 19, 2018
bd05a94
Fix wait_for_test test reporting
jgfouca Jul 19, 2018
d952d4b
Add CXXFLAGS and KOKKOS_PATH to the xml schema for config_compilers
mfdeakin-sandia Jul 20, 2018
a33c4db
Merge branch 'mfdeakin-sandia/snl-testbeds' (PR #2455) into master
mfdeakin-sandia Jul 22, 2018
1873425
Output MPI task to compute node mapping
Jul 23, 2018
22e8dcd
Unset environment variables to output task-to-node mapping
Jul 23, 2018
3d7ef21
Fix archiving of cam and clm history
rljacob Jul 23, 2018
2b64d03
Modify task map output format
Jul 23, 2018
a5f9b78
Uncomment MV2_CPU_MAPPING definition for Anvil
Jul 23, 2018
6645a7c
Merge branch 'sarats/machinefiles/titan-intel-update' into master (PR…
minxu74 Jul 24, 2018
185d396
Modify driver output format
Jul 26, 2018
4c4f8dd
Remove unnecessary white space in task-to-node map output
Jul 27, 2018
37fed55
Adds four ERS tests for land BCG
Jul 30, 2018
a636e97
Update edison to use cray-mpich 7.7.0 from 7.6.0 after software maint…
ndkeen Jul 30, 2018
f3a8f2f
For edison, add command "module load pe_archive" to allow using older…
ndkeen Jul 31, 2018
a67734e
Avoid empty env blocks
amametjanov Jul 31, 2018
ce20e03
Merge branch 'bishtgautam/lnd/eca-bgc-test' (PR #2468)
jqyin Aug 1, 2018
fccf2ec
Merge branch 'maint-1.0' to master (PR #2475)
rljacob Aug 2, 2018
a815c56
Progress
jgfouca Aug 2, 2018
f8e0a7d
Remove debug stuff
jgfouca Aug 2, 2018
03d3011
wait_for_test logging working
jgfouca Aug 2, 2018
7a42153
Big update to wait_for_test/jenkins
jgfouca Aug 3, 2018
f3c707e
Make TESTBUILDFAIL produce a bldlog file
jgfouca Aug 3, 2018
0cbbc8a
Remove useless commented-out code
jgfouca Aug 3, 2018
5b7ee4e
Merge branch 'jgfouca/cime/wait_for_test_upgrades' into jgfouca/cime/…
jgfouca Aug 3, 2018
635294d
Make pylint happy
jgfouca Aug 6, 2018
f67e01c
Progress
jgfouca Aug 6, 2018
1a752ab
Merge branch 'worleyph/cime/taskmap' into master (PR #2458)
jgfouca Jul 31, 2018
ce58118
Merge branch 'jgfouca/cime/upgrade_wait_for_tests_cdash' into master …
jgfouca Aug 6, 2018
05f8299
Be sure to upload build logs for sharedlib build fails
jgfouca Aug 7, 2018
b75e805
Lots of fixes
jgfouca Aug 8, 2018
44a523e
Restore melvin to 1TB of test data
jgfouca Aug 8, 2018
f0ef79e
Merge branch 'jgfouca/cime/archive_old_test_results' into master (PR …
jgfouca Aug 8, 2018
d3cc621
Merge esmci_remote_for_split/master
jgfouca Aug 8, 2018
51b0a64
Make codacy happy
jgfouca Aug 8, 2018
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
14 changes: 7 additions & 7 deletions config/e3sm/allactive/config_pesall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2649,14 +2649,14 @@
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
<ntasks>
<ntasks_atm>384</ntasks_atm>
<ntasks_lnd>384</ntasks_lnd>
<ntasks_rof>384</ntasks_rof>
<ntasks_atm>363</ntasks_atm>
<ntasks_lnd>363</ntasks_lnd>
<ntasks_rof>363</ntasks_rof>
<ntasks_ice>128</ntasks_ice>
<ntasks_ocn>128</ntasks_ocn>
<ntasks_glc>64</ntasks_glc>
<ntasks_wav>64</ntasks_wav>
<ntasks_cpl>384</ntasks_cpl>
<ntasks_cpl>363</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>2</nthrds_atm>
Expand Down Expand Up @@ -8112,7 +8112,7 @@
</pes>
</mach>
<mach name="edison">
<pes compset=".*CAM5.+CLM45.+MPASSI.+MPASO.+MOSART.*" pesize="any">
<pes compset=".*CAM5.+CLM45.+MPASCICE.+MPASO.+MOSART.*" pesize="any">
<comment>"edison ne4 coupled compest on 6 nodes, OCN by itself on 2 nodes sypd=45.2"</comment>
<ntasks>
<ntasks_atm>96</ntasks_atm>
Expand Down Expand Up @@ -8427,7 +8427,7 @@
</grid>
<grid name=".*T62_oi%oRRS18to6*">
<mach name="cori-knl">
<pes compset=".*MPASSI.+MPASO.+" pesize="any">
<pes compset=".*MPASCICE.+MPASO.+" pesize="any">
<comment>cori-knl, hires (18to6) G case on 150 nodes, 64x2, sypd=0.5</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
Expand Down Expand Up @@ -8456,7 +8456,7 @@
</grid>
<grid name=".*T62_oi%oEC60to30.*">
<mach name="cori-knl">
<pes compset=".*MPASSI.+MPASO.+" pesize="any">
<pes compset=".*MPASCICE.+MPASO.+" pesize="any">
<comment>cori-knl, lowres (60to30) G case on 16 nodes, 64x2, sypd=2.42</comment>
<MAX_MPITASKS_PER_NODE>64</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>128</MAX_TASKS_PER_NODE>
Expand Down
58 changes: 57 additions & 1 deletion config/e3sm/config_grids.xml
View file
Open in desktop
< E294 td class="blob-num blob-num-expandable" colspan="2"> Expand Down Expand Up
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,16 @@

<!-- spectral element grids -->

<model_grid alias="ne4_oQU480">
<grid name="atm">ne4np4</grid>
<grid name="lnd">ne4np4</grid>
<grid name="ocnice">oQU480</grid>
<grid name="rof">r05</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>oQU480</mask>
</model_grid>

<model_grid alias="ne4_oQU240">
<grid name="atm">ne4np4</grid>
<grid name="lnd">ne4np4</grid>
Expand Down Expand Up @@ -991,6 +1001,16 @@
<mask>gx1v6</mask>
</model_grid>

<model_grid alias="T62_oQU480" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oQU480</grid>
<grid name="rof">rx1</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>oQU480</mask>
</model_grid>

<model_grid alias="T62_oQU240" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
Expand Down Expand Up @@ -1346,6 +1366,7 @@
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v6.090320.nc</file>
<file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx3v7.090911.nc</file>
<file grid="atm|lnd" mask="mpasgx1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_mpasgx1.150903.nc</file>
<file grid="atm|lnd" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU480.151209.nc</file>
<file grid="atm|lnd" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU240.151209.nc</file>
<file grid="atm|lnd" mask="oQU240wLI">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU240wLI_mask.160929.nc</file>
<file grid="atm|lnd" mask="oQU120">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU120.151209.nc</file>
Expand All @@ -1367,7 +1388,7 @@
<nx>128</nx>
<ny>64</ny>
<file grid="atm|lnd" mask="usgs">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.T42_USGS.111004.nc</file>
<file grid="ocn" mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
<file grid="ice|ocn" mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
<desc>T42 is Gaussian grid:</desc>
</domain>

Expand All @@ -1380,7 +1401,9 @@
<domain name="ne4np4">
<nx>866</nx>
<ny>1</ny>
<file grid="atm|lnd" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU480.180702.nc</file>
<file grid="atm|lnd" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.lnd.ne4np4_oQU240.160614.nc</file>
<file grid="ice|ocn" mask="oQU480">$DIN_LOC_ROOT/share/domains/domain.ocn.ne4np4_oQU480.180702.nc</file>
<file grid="ice|ocn" mask="oQU240">$DIN_LOC_ROOT/share/domains/domain.ocn.ne4np4_oQU240.160614.nc</file>
<desc>ne4np4 is Spectral Elem 7.5-deg grid:</desc>
</domain>
Expand Down Expand Up @@ -1694,6 +1717,13 @@
<desc>tx0.1v2 is an old mask used for CONUS:</desc>
</domain>

<domain name="oQU480">
<nx>1791</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.oQU480.151209.nc</file>
<desc>oQU480 is an MPAS ocean mesh with quasi-uniform 480 km grid cells, nominally 4 degree resolution:</desc>
</domain>

<domain name="oQU240">
<nx>7153</nx>
<ny>1</ny>
Expand Down Expand Up @@ -1819,6 +1849,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx3v7/</map>
</gridmap>

<gridmap atm_grid="ne4np4" ocn_grid="oQU480">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_aave.180702.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_conserve.180702.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU480_conserve.180702.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oQU480/map_oQU480_to_ne4np4_aave.180702.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oQU480/map_oQU480_to_ne4np4_aave.180702.nc</map>
</gridmap>

<gridmap atm_grid="ne4np4" ocn_grid="oQU240">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU240_aave.160614.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne4np4/map_ne4np4_to_oQU240_aave.160614.nc</map>
Expand Down Expand Up @@ -2036,6 +2074,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/mpasgx1/map_mpasgx1_TO_T62_aave.150827.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU480">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_aave.151209.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_patc.151209.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU480_blin.151209.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oQU480/map_oQU480_TO_T62_aave.151209.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oQU480/map_oQU480_TO_T62_aave.151209.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="oQU240">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU240_aave.151209.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_TO_oQU240_patc.151209.nc</map>
Expand Down Expand Up @@ -2385,6 +2431,11 @@

<!--- current MPAS grids -->

<gridmap ocn_grid="oQU480" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_oQU480_nn_151209.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oQU480_nn_151209.nc</map>
</gridmap>

<gridmap ocn_grid="oQU240" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_oQU240_nn.160527.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oQU240_nn.160527.nc</map>
@@ -2455,6 +2506,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oRRS15to5_nn.160527.nc</map>
</gridmap>

<gridmap ocn_grid="oQU480" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_oQU480_nn.180702.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_oQU480_nn.180702.nc</map>
</gridmap>

<gridmap ocn_grid="oQU240" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_oQU240_nn.160714.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_oQU240_nn.160714.nc</map>
Expand Down
12 changes: 12 additions & 0 deletions config/e3sm/machines/config_batch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,18 @@
</queues>
</batch_system>

<batch_system MACH="snl-white" type="lsf" >
<queues>
<queue walltimemax="02:00" default="true">rhel7G</queue>
</queues>
</batch_system>

<batch_system MACH="snl-blake" type="slurm" >
<queues>
<queue walltimemax="02:00" default="true">blake</queue>
</queues>
</batch_system>

<batch_system MACH="lawrencium-lr2" type="slurm" >
<directives>
<directive>--ntasks-per-node={{ tasks_per_node }}</directive>
Expand Down
Loading
0