Skip to content
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

Jgfouca/acme merge 06 01 2017 #1634

Merged
merged 301 commits into from
Jun 13, 2017
Merged

Jgfouca/acme merge 06 01 2017 #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
301 commits
Select commit Hold shift + click to select a range
cea4d23
Merge branch 'singhbalwinder/machinefiles/constance-cime5-mach-files'…
susburrows Mar 30, 2017
f4963b0
Merge branch 'singhbalwinder/atm/tests-for-4p2' (PR #1226)
susburrows Mar 30, 2017
fc7c143
Adds machine files for PNNL-EMSL cluster cascade
singhbalwinder Feb 23, 2017
44d8f9e
Use proper syntax to refer to OMP_NUM_THREADS
jgfouca Mar 30, 2017
10acd03
Guard against div-by-zero in memory baseline comparison
jgfouca Mar 30, 2017
8b102e0
Move setting of OMP_NUM_THREADS earlier
jgfouca Mar 30, 2017
fbf4ed1
Merge remote-tracking branch 'origin/oksanaguba/fix-make-c0' PR #1204
mt5555 Mar 31, 2017
f27a1c6
Merge remote-tracking branch 'origin/azamat/homme/improve-reductions'…
mt5555 Mar 31, 2017
fa7ecc1
Merge remote-tracking branch 'origin/worleyph/cam/twin_alg_init_opt' …
mt5555 Mar 31, 2017
f546d8b
Avoid hyper-threading on Edison
amametjanov Apr 1, 2017
9f08b65
Merge branch 'jgfouca/cime/omp_num_threads' (PR #1359)
amametjanov Apr 1, 2017
8ce126b
Adds E and I compsets for BGC experiments
Apr 4, 2017
21b0dea
Add runoff map specification for r0125 to oRRS18to6v3_ICG
jonbob Apr 4, 2017
82b1792
Merge branch 'mark-petersen/ocn/update_output_settings' (PR #1312)
jonbob Apr 4, 2017
27c7fa4
Ignore any exception from resource setting.
jgfouca Apr 4, 2017
5f9fdae
Merge branch 'jgfouca/cime/fix_mem_div_by_zero' (PR #1360)
amametjanov Apr 5, 2017
ceb4988
Fix PIO2 bug in restart_physics
wlin7 Apr 5, 2017
b413b5c
Adds endrun calls if singular matrices are detected by CLUBB routines
wlin7 Apr 5, 2017
2c91b1d
Merge branch 'bishtgautam/lnd/update-initial-cond' (PR #1331)
jqyin Apr 5, 2017
fcd6ec7
Corrects the RUN_STARTDATE
Apr 5, 2017
72e26e6
Merge branch 'singhbalwinder/atm/bugfix-mo_strato_rates' (PR #1112)
susburrows Apr 5, 2017
a4736e3
Fixs the cprnc tool path on ornl cades cluster
jqyin Apr 6, 2017
4c26866
Merge branch 'jqyin/machinefiles/ornl-cades' (PR #1373)
jqyin Apr 6, 2017
7b1b260
Added WCYCL compsets for hi-res 1850 and 20TR
singhbalwinder Apr 6, 2017
921f0e8
Fix PEs for acme_dev tests on Cetus
amametjanov Apr 7, 2017
a421603
Fixes a bug where snicar file path was hardwired in ice_init.F90
wlin7 Apr 10, 2017
ea9d413
Add entry for ne120np4_oRRS18to6v3_ICG to config_grids.xml
jonbob Apr 10, 2017
ffd2fd9
Merge branch 'jinyuntang/lnd/betr_arrfix1' (PR #1362)
Apr 10, 2017
74b6632
Add a walltime flag to jenkins_generic_job
jgfouca Apr 10, 2017
8a1af56
Merge branch 'mark-petersen/ocn/change_EC60to30_timestep' (PR #1313)
jonbob Apr 11, 2017
05a2585
Fixes the PIO build fail on Eos
jqyin Apr 11, 2017
7789ba8
Adds walltimemax for Eos batch config
jqyin Apr 11, 2017
6c5c731
Also needs the domain definition for oRRS18to6v3_ICG
jonbob Apr 11, 2017
7c86a93
Merge branch 'jonbob/cime/fix-highres-grid' (PR #1384)
jonbob Apr 11, 2017
c8e3a1f
Turn on FORT_BUFFERED on Edison
amametjanov Apr 12, 2017
59f237c
Merge branch 'wlin/atm/v1ac-h01-f1850-f20tr' (PR #1372)
singhbalwinder Apr 12, 2017
1402160
Merge branch 'jqyin/machinefiles/fix-eos' (PR #1394)
jqyin Apr 12, 2017
532c704
Adds test mods directory for running cosp lite configuration
singhbalwinder Apr 12, 2017
bf2db7d
Removes melvin if block from cam test mods, adds melvin to config_pio
singhbalwinder Apr 13, 2017
2fdd0f1
Merge remote-tracking branch 'origin/azamat/homme/optimize-limiter' P…
mt5555 Apr 13, 2017
34c49bf
Rename ACME/cime directories in prep for CIME merge
agsalin Apr 13, 2017
ccc6d04
More renaming.
agsalin Apr 13, 2017
c6b12fb
preview_namelists.create_namelists was re-creating dirs
jgfouca Apr 13, 2017
53193e1
Merge branch 'jgfouca/cime/create_namelists_fix' into master (PR #1406)
jgfouca Apr 13, 2017
b31cd3a
Add mapping file designations for ne120_oRRS18v3_ICG grid
jonbob Apr 13, 2017
5dfda63
Added eddi machine files. eddi is a small developer node at LBNL.
rgknox Apr 13, 2017
eb80516
Merge commit '6156e0a' into agsalin/update-to-cime5.3
agsalin Apr 13, 2017
80ca329
Adds two tests for ALM ECA model
Apr 11, 2017
6d2f30a
Adds mvapich support for grizzly
vanroekel Mar 30, 2017
f50eadb
Fixes an LD_LIBRARY issue
vanroekel Mar 30, 2017
9b7a56e
Specifies QOS
vanroekel Mar 30, 2017
de57f36
Fixes to get tests to pass.
agsalin Apr 14, 2017
a13e6de
Fixes mvapich
vanroekel Mar 30, 2017
3dc6f13
Adds a PIO filesystem hint
vanroekel Apr 10, 2017
657f69c
removes a friendly testing reference
vanroekel Apr 11, 2017
916584b
adds pnetcdf flags just in case
vanroekel Apr 11, 2017
cac8835
HOMME test typo fix
jgfouca Apr 14, 2017
4b41d8e
Modifications to support LANL IC machines with changes for CIME5.2
jonbob Apr 14, 2017
658527b
Merge branch 'azamat/homme/cleanup-thread-vars' (PR #1246)
amametjanov Apr 14, 2017
9770492
Add more error handling for missing restoring files and turn diurnal …
jonbob Apr 14, 2017
61e39c4
Modified batch system to slurm and fixed an environment issue.
singhbalwinder Apr 14, 2017
61b4597
Fixed whitespace errors in Makefile killing COSP
agsalin Apr 14, 2017
b09d188
Restore ACME version of shr_orb_cosz
rljacob Apr 15, 2017
867b9a2
Merge branch 'singhbalwinder/machinefiles/cascade' (PR #1285)
susburrows Apr 15, 2017
872fe26
Add ability to archive MPAS land ice files
rljacob Apr 17, 2017
4ade258
Re-add eca testmod, was somehow lost in big merge
jgfouca Apr 17, 2017
315e207
Fix merge mistake
jgfouca Apr 17, 2017
d14e3db
Merge pull request #1364 from ACME-Climate/bishtgautam/lnd/e-and-i-bg…
xtcai Apr 17, 2017
16f862a
Reset invalid pio_numiotasks
jayeshkrishna Apr 17, 2017
e3da3bd
Fix issues specific to grizzly.
jonbob Apr 17, 2017
c0cac37
Merge branch 'jonbob/cime/high-res-ICG-mapping' (PR #1407)
jonbob Apr 18, 2017
b4783bf
Remove some changes to make consistent with CIME5.3
jonbob Apr 18, 2017
d2e4b11
Fix titan problem
jgfouca Apr 18, 2017
52109e4
Merge branch 'qzhu-lbl/lnd/bugfix2' (PR #1395)
Apr 19, 2017
ab892b9
Merge branch 'agsalin/update-to-cime5.3' (PR #1413)
jgfouca Apr 19, 2017
83e1320
Changes needed to support jenkins testing on cori-knl
jgfouca Apr 19, 2017
879f5c6
Shortens the simulation length of a crop model test
Apr 18, 2017
6956c57
Update Cetus test PEs
amametjanov Apr 14, 2017
359e2fe
Adjust to match PEs for MPAS tests
amametjanov Apr 18, 2017
ffc257f
Update mach_syslog for other platforms to match that for Anvil
Apr 20, 2017
20bd408
Modify collection of provenance data on all supported systems
Apr 20, 2017
765dad4
Decrease amount of provenance data collected on Anvil and Titan
Apr 20, 2017
ed5af39
compset updates
Apr 20, 2017
b69d077
Merge branch 'wlin/atm/calipsofix-mgflx' (PR #1333)
singhbalwinder Apr 20, 2017
515da75
Use the env variable CSCRATCH instead of SCRATCH for edison as this p…
ndkeen Apr 20, 2017
7baa420
Change default stride to 64 on cori-knl
ndkeen Apr 20, 2017
47e0ee8
Merge branch 'jonbob/cime/update-ic-machines-041417' (PR #1412)
jonbob Apr 20, 2017
e65903d
Removed deprecated config_pes.xml*
Apr 20, 2017
4489fa5
Removed config_compsets.xml.cime2
Apr 20, 2017
38aa7d8
Refactor provenance saving
jgfouca Apr 20, 2017
cd3ffa1
Added a S,M,L layouts for ne4_oQU240
Apr 11, 2017
365b088
Adjust the loading/removing of modules to allow building on cori-knl …
ndkeen Apr 21, 2017
ede71ed
Merge remote-tracking branch 'origin/erichlf/cime/ne4edisonPEs' PR#1430
mt5555 Apr 21, 2017
cd50296
Merge branch 'singhbalwinder/atm/costlite-testmod' (PR #1403)
susburrows Apr 21, 2017
71aaf9e
Merge remote-tracking branch 'rgknox:rgknox/ACME/rgknox-ed-springclea…
Apr 21, 2017
1f61fd4
Fix bonehead mistake
jgfouca Apr 21, 2017
6e7372d
Minor change to cori scratch dirs
jgfouca Apr 24, 2017
e72be88
change underscore to hyphens
jgfouca Apr 24, 2017
30f6336
Merge branch 'jgfouca/cime/add_support_for_cori_knl' into master (PR …
jgfouca Apr 24, 2017
b9f1f71
Disable FP checks for a certain LAPACK routine, by using ieee_excepti…
ndkeen Apr 24, 2017
f46ffa0
jenkins_generic_job add better support for changing scratch root
jgfouca Apr 24, 2017
4f41f66
Move last remaining files out of cime_config
jgfouca Apr 24, 2017
2b64593
More progress
jgfouca Apr 24, 2017
13133de
For cori-knl, add another node (from 64 MPI's to 128) for the a%360x7…
ndkeen Apr 24, 2017
7244c8f
Removing cime/src/externals/mct for subtree update
rljacob Apr 25, 2017
2d8caaf
Merge commit 'caf63ed5d861b8000fedf9534b9814f803c61aa7' as 'cime/src/…
rljacob Apr 25, 2017
1615418
Don't accept non-existent SAVE_TIMING_DIR
jgfouca Apr 25, 2017
d42d625
bless_test_results should work without write access to case
jgfouca Apr 25, 2017
58c3354
Update PIO_TYPENAME default for LANL IC machine wolf.
jonbob Apr 25, 2017
94a8a5d
Merge branch from ACME-Climate/ndk/cime/edison-CSCRATCH2 (PR #1431)
ndkeen Apr 26, 2017
387774e
Merge branch ACME-Climate/ndk/cime/cori-knl-stride64 (PR #1433)
ndkeen Apr 26, 2017
e3071bf
Merge branch ACME-Climate/ndk/cam/disableFPchecks3 (PR #1444)
ndkeen Apr 26, 2017
b8fa449
Jenkins jobs should always have umask 002
jgfouca Apr 26, 2017
78003e3
Spell valid right
jgfouca Apr 26, 2017
c0183e4
compare_test_results should not require write access to case dirs
jgfouca Apr 26, 2017
e53dbcc
Revert "compare_test_results should not require write access to case …
jgfouca Apr 26, 2017
9933df5
compare_test_results: should work much better when cases are not writ…
jgfouca Apr 26, 2017
c37feff
Merge branch 'worleyph/cime/update_provenance_collection' (PR #1429)
amametjanov Apr 27, 2017
dcef901
fix mpas pattern matching so only interim restart files are deleted
sarich Apr 27, 2017
4d3c37e
Introduced tests for ne30_oECv3_ICG.A_WCYCL1850S
rljacob Apr 28, 2017
9ae2667
Switch PIO default from mpi_[i]rsend to mpi_[i]send
jayeshkrishna Apr 28, 2017
098fffc
Make sure clean <COMPONENT> cleans up obj dir
jayeshkrishna May 1, 2017
15a2cbc
Merge commit 'esmci/ae2a5ca' into update-to-cime5.3.1
agsalin May 1, 2017
f526ba6
Merge branch 'jgfouca/cime/refactor_provenance' (PR #1436)
May 2, 2017
6e418d5
Merge branch 'rljacob/cime/fix-mpas-starchive' (PR #1334)
rljacob May 2, 2017
322d849
Merge branch 'bishtgautam/lnd/crop-model-test' (PR #1422)
jqyin May 2, 2017
82c347c
Updating PIO1 to latest master
jayeshkrishna Apr 28, 2017
3c71042
Machine update for ANL Theta
amametjanov May 2, 2017
b8e7885
Merge '15297cd' into agsalin/update-to-cime5.3.1
agsalin May 2, 2017
a63f64c
Revert change in pio1 to point into pio2/cmake
agsalin May 2, 2017
d6031f1
Comment out invalid_args check
agsalin May 3, 2017
ab8ac81
Update Sandia worksations to gcc5.3.0
agsalin May 3, 2017
feb89de
Adjust PE layouts for cori-haswell for several acme_developer tests.
ndkeen May 3, 2017
90dea2b
Update edison pe-layouts for A_WCYCL compsets
jonbob May 3, 2017
f10fac8
Fix acme template change for new parser
agsalin May 3, 2017
6a71661
Make single-dash before multichar arg a warning
agsalin May 3, 2017
53fdd48
Set the default value of DOUT_S_SAVE_INTERIM_RESTART_FILES to TRUE so…
mfdeakin-sandia May 4, 2017
910dc01
Use nf-config instead of nc-config to get fortran netcdf libs
jgfouca May 4, 2017
b690b7a
Update support for LBL machines
May 4, 2017
34de300
Merge branch 'jonbob/cime/update-ic-machines-042517' into (PR #1454)
jonbob May 4, 2017
d842a3c
Merge branch ACME-Climate/ndk/cime/cori-knl-modadjust-for-gnu (PR #1447)
ndkeen May 4, 2017
7073d6c
Merge branch ACME-Climate/ndk/cime/cori-haswell-pelayouts-tests2 (PR …
ndkeen May 4, 2017
07fec90
Update the M edison pe-layout for ne30-oEC to Pat Worley's 133-node c…
jonbob May 4, 2017
d1e5cca
Merge branch 'jonbob/machines/update-edison-B-layouts' (PR #1488)
jonbob May 4, 2017
799853f
modify files for support for LC machines
Mar 29, 2017
b49e040
updates to allow ACME to run on LC
Apr 4, 2017
bee7540
Code clean ups
Apr 4, 2017
084b05e
modifications for PR review
Apr 18, 2017
f77b8ec
remove white space
Apr 19, 2017
2eb9826
add support for mpi-serial builds (for SCM)
Apr 19, 2017
116416c
Merge branch 'erichlf/cime/config_pes' (PR #1435)
rljacob May 4, 2017
229bff7
change soft to generic for PR approval
May 4, 2017
5140655
Merge branch 'azamat/edison/fort_buffered' (PR #1398)
ndkeen May 4, 2017
5e77f65
Moves cosplite testmods directory under cam folder
singhbalwinder May 4, 2017
5d0f773
Merge branch 'azamat/cetus/fix-test-timeouts' (PR #1414)
amametjanov May 4, 2017
aac2448
Merge 'singhbalwinder/atm/change-cosp-testmods-dir' into master (PR #…
jgfouca May 4, 2017
1d721d1
Updates the queues for LBL machine
May 4, 2017
a0e7c78
Merge branch 'azamat/machines/theta' (PR #1482)
amametjanov May 5, 2017
325cf14
More updates for LBL machines
May 5, 2017
f4af5cd
Adds cam-cosplite test in acme developer
singhbalwinder May 5, 2017
723104f
Merge branch 'singhbalwinder/atm/add-cosplite-test' into master (PR #…
jgfouca May 5, 2017
9d11e9d
Minor update of modules for cori-knl.
ndkeen May 7, 2017
cade86f
Fixing mpi-serial builds on compute001
jayeshkrishna May 8, 2017
e346bc8
Changes ERS to SMS_D test for cosplite
singhbalwinder May 8, 2017
a9ff84d
Merge 'origin/jgfouca/cime/use_nf_config_instead_of_nc_config' into m…
jgfouca May 8, 2017
19b28e2
Add a more reasonable pe layout for the a%ne30np4 grid for cori-knl.
ndkeen May 8, 2017
da48ab2
Merge branch 'ACME-Climate/mfdeakin-sandia/save_inter_restarts' (PR #…
rljacob May 8, 2017
12b4dfa
Setting NETCDF_PATH directly for anlworkstation
jayeshkrishna May 8, 2017
b41fad1
Adds a special instruction for cetus machines regarding cosplite test
singhbalwinder May 9, 2017
9dbe5c6
Adding shared lib path for hdf5 on compute001
jayeshkrishna May 9, 2017
4102b32
Make sure clean clm cleans up obj dir
jayeshkrishna May 9, 2017
807fd59
Modifies SMS_D_Ln5_P8x4 to SMS_Ln5 to avoid cetus and melvin issues
singhbalwinder May 9, 2017
0bb40ee
Changing jobmin to 1 for batch q on blues
jayeshkrishna May 9, 2017
db075c6
Merge branch ACME-Climate/ndk/cime/cori-knl-pelayoutne30 (PR #1507)
ndkeen May 9, 2017
88a89de
Merge branch ACME-Climate/ndk/cime/cori-knl-upgrade-mods-pes (PR #1502)
ndkeen May 10, 2017
5d7efa6
bug fix
Apr 20, 2017
c249546
update comments for generic module load
May 10, 2017
74964ea
remove whitespace
May 10, 2017
d083682
Merge branch 'bogensch/atm/SCM_dev_BLH_v3' (PR #1350)
singhbalwinder May 11, 2017
2873e3c
Adds options to the st_archive to specify the last date (--last-date)…
mfdeakin-sandia May 5, 2017
5adb245
Update template.st_archive
agsalin May 5, 2017
9ecf226
Fix code format issue - replace unused variable with _
mfdeakin-sandia May 5, 2017
d4a0aa4
Implemented most of the machinery for testing with "incomplete" log f…
mfdeakin-sandia May 9, 2017
3f339ac
Implement the copy_only option for short term archiving. This copies …
mfdeakin-sandia May 10, 2017
8cfd7c8
Adds a warning when using the --last-date option and to its help
mfdeakin-sandia May 11, 2017
44fc589
Merge branch 'jayeshkrishna/fix_blues_batchq_settings' (PR #1511)
jayeshkrishna May 12, 2017
20449f8
Merge branch 'jayeshkrishna/fix-mpi-serial-anlworkstation-02-050817' …
jayeshkrishna May 12, 2017
b6569ef
Merge branch 'jayeshkrishna/cime_clean_component' (PR #1475)
jayeshkrishna May 12, 2017
ac27963
Merge branch 'jayeshkrishna/mira_homme_test_update_pio1' (PR #1480)
jayeshkrishna May 12, 2017
cb6032d
Merge branch 'jayeshkrishna/switch_pio_rsend2isend' (PR #1503)
jayeshkrishna May 12, 2017
5a5599a
Merge branch 'jonbob/mpaso/support-salinity-restoring' (PR #1419)
jonbob May 12, 2017
cc8095a
Fix jenkins_generic_job when user selects specific machines.
jgfouca May 12, 2017
f95d4e0
Merge branch 'rljacob/coupled/test-spinups' into master (PR #1469)
jgfouca May 4, 2017
7d8a1b8
Merge branch 'bishtgautam/machinefiles/lbl-lawrencium' (PR #1495)
May 12, 2017
86ed9e1
Updating modules and compiler flags for cori-haswell.
ndkeen May 12, 2017
fbc820b
Merge 'origin/jgfouca/cime/fix_jenkins_submit_to_non_default_mach' in…
jgfouca May 12, 2017
3308a8e
Update GNU to 6.2, which also needs increased version of mpich to 7.5.1.
ndkeen May 12, 2017
f711238
added spunup A_WCYCL options (1850S and 2000S) for v0atm
PeterCaldwell May 12, 2017
abf1797
Merge 'singhbalwinder/atm/change-cosplite-from-ERS-to-SMS' (PR #1505)
jgfouca May 12, 2017
c36dbb0
Adds the --force-move option and implies --copy-only when --last-date…
mfdeakin-sandia May 12, 2017
f15d5e3
Added a new cosplite test mods directory with nhtfrq=5
singhbalwinder May 12, 2017
6df0c18
More correctly add the "intel17" compiler, which is simply
ndkeen May 13, 2017
8cd5354
Merge branch 'PeterCaldwell/atm/beta1_05v0atm-try2' (PR #1528)
rljacob May 15, 2017
5711998
Merge 'mfdeakin-sandia/in_run_archive' into master (PR #1523)
jgfouca May 15, 2017
0bb7c3a
Merge branch 'master' into agsalin/update-to-cime5.3.1
jgfouca May 15, 2017
b30fa99
revert unintended change to slurm
May 15, 2017
399f095
Bug fix: Handle failures to get mem usage from baselines
jgfouca May 16, 2017
736f55c
Merge 'singhbalwinder/atm/cosplite-nhtfrq5' into master (PR #1530)
jgfouca May 15, 2017
009f358
Merge branch ACME-Climate/ndk/cime/cori-haswell-modupdates3 (PR #1526)
ndkeen May 16, 2017
79d99ef
Fix upstream merge resolution mistake
jgfouca May 17, 2017
9c4f179
Fix default coupling intervals for C- and G-compsets
jonbob May 17, 2017
72ad0b9
Only affects compiler=intel17: Also add the no-opt-dynamic-flag for d…
ndkeen May 17, 2017
f5bfe3c
Only turn on MPICH_CPUMASK_DISPLAY when DEBUG=TRUE.
ndkeen May 17, 2017
eef57f7
Remove MPIFC/SFC settings for specific compiler entries at NERSC.
ndkeen May 17, 2017
a03fd51
Remove -DCMAKE_SYSTEM_NAME=Catamount
ndkeen May 17, 2017
b05bf42
Add fix to bug in docn that was in this cime version
rljacob May 17, 2017
4619d48
re-enable CPUMASK DISPLAY env for edison
ndkeen May 17, 2017
95c2c94
Adds test mods for RTM=NULL
singhbalwinder May 18, 2017
6509197
Merge branch 'agsalin/update-to-cime5.3.1' (PR #1490)
jgfouca May 18, 2017
97f8f60
Revert my previous change to clean up the XML.
ndkeen May 18, 2017
f373524
Forgot to put MPICH_CPUMASK_DISPLAY back in there for edison.
ndkeen May 18, 2017
51a3247
Allocate send/recv buffs always when useswapm
rljacob May 22, 2017
c6ed6f3
Merge branch 'jonbob/cime/fix-CG-coupling-intervals' (PR #1543)
jonbob May 22, 2017
29d8feb
Merge branch ACME-Climate/ndk/cime/edison-gnu62 (PR #1533)
ndkeen May 22, 2017
3b44c82
Allocate send/recv buffs even if nprocs eq 0
rljacob May 23, 2017
341bbc7
Merge branch 'rljacob/cime/update2-mct-2.10.beta' (PR #1452)
rljacob May 23, 2017
b4d374f
Merge branch 'bogensch/cime/ACMEv1_LC_Machines' (PR #1452)
May 23, 2017
564ed23
fates-interface: added machine configuration and tests to cime
rgknox May 24, 2017
cd69728
fates-interface: testmod for fates
rgknox May 24, 2017
492ea15
Set up chama in cime
jgfouca May 26, 2017
d3a9277
Merge branch 'rgknox/lnd/fates-part3' (PR #1536)
May 26, 2017
e542f68
In ACME provenance code, handle failure to retrieve job_id
jgfouca May 28, 2017
43b9695
Fix expression evaluation for batch submit args
jgfouca May 28, 2017
2065ab1
Merge branch 'singhbalwinder/atm/rtm-null' into master (PR #1546)
jgfouca May 30, 2017
66fd3e5
Merge branch 'jgfouca/cime/fix_expr_eval_for_batch_args' (PR #1563)
amametjanov May 31, 2017
212daac
Make jenkins submodule handling more robust
jgfouca May 31, 2017
fe3c951
Remove submodule hacks from CIME
jgfouca May 31, 2017
71c5138
Remove duplicate testmods
jgfouca May 31, 2017
0a2975c
Improve error from check_input_data when cannot connect to SVN repo
jgfouca Jun 1, 2017
711d92e
Update error msg based on github feedback
jgfouca Jun 1, 2017
77c8af1
Merge branch 'jgfouca/cime53010-with-acmesplit-06012017' into jgfouca…
jgfouca Jun 2, 2017
fc1dd59
Fix up ACME's config machines
jgfouca Jun 2, 2017
d1837fc
Fixes to merge
jgfouca Jun 2, 2017
6cd4b55
More fixes
jgfouca Jun 2, 2017
873f32f
Remove quotes
jgfouca Jun 2, 2017
193b7d0
Remove src/drivers/mct/bld
jgfouca Jun 9, 2017
e0bd0f8
ACME and CESM have different defaults for DOUT_S_SAVE_INTERIM_RESTART…
jgfouca Jun 9, 2017
923a05d
Revert a couple changes
jgfouca Jun 9, 2017
c820f68
Remove zombie files
jgfouca Jun 13, 2017
ebdb1c4
Minor test fix
jgfouca Jun 13, 2017
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
61 changes: 61 additions & 0 deletions config/acme/allactive/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,39 @@
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_RTM_MPASLIALB_SWAV</lname>
</compset>

<!-- ACME v1 science compsets (hires) -->

<compset>
<alias>A_WCYCL2000_H01A</alias >
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000_H01AS</alias >
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01A</alias >
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01AS</alias >
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>


<compset>
<alias>A_WCYCL20TR_H01A</alias >
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TR_H01AS</alias >
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<!-- ACME backup compsets -->
<compset>
<alias>A_WCYCL1850_v0atm</alias>
Expand All @@ -87,6 +120,17 @@
<lname>2000_CAM5_CLM45%SP_MPASCICE_MPASO_MOSART_SGLC_SWAVi</lname>
</compset>

<compset>
<alias>A_WCYCL1850S_v0atm</alias>
<lname>1850_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000S_v0atm</alias>
<lname>2000_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAVi</lname>
</compset>


<!-- ACME BG compsets -->

<compset>
Expand Down Expand Up @@ -145,4 +189,21 @@
<lname>1850_CAM5_CLM45%BGC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>E1850C5CNECACTCBC</alias>
<lname>1850_CAM5_CLM45%CNECACTCBC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>E20TRC5CNECACTCBC</alias>
<lname>20TR_CAM5_CLM45%CNECACTCBC_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
</compset>

<entries>
<entry id="RUN_STARTDATE">
<values>
<value compset="20TR_CAM">1850-01-01</value>
</values>
</entry>
</entries>
</compsets>
2,355 changes: 0 additions & 2,355 deletions config/acme/allactive/config_compsets.xml.cime2
View file
Open in desktop

This file was deleted.

Loading