From e78814d3d628bdfae8545967e7a201ab76533a84 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 29 Aug 2019 13:15:21 -0600 Subject: [PATCH 1/5] In reduceOutput testmod, stop trying to use subset rearranger on hobart I checked a case, and this wasn't actually working (probably because hostname gives hobart.cgd.ucar.edu rather than just hobart). Since this doesn't seem necessary, I'm just going ahead and removing it. @ekluzek --- .../testdefs/testmods_dirs/clm/reduceOutput/shell_commands | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/reduceOutput/shell_commands b/cime_config/testdefs/testmods_dirs/clm/reduceOutput/shell_commands index 350466ae70..070b7ba1a8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/reduceOutput/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/reduceOutput/shell_commands @@ -1,8 +1,3 @@ #!/bin/bash -# -# # Use SUBSET rearranger on hobart -if [ `hostname` == "hobart" ]; then - ./xmlchange LND_PIO_REARRANGER=2 -fi ./xmlchange BFBFLAG="TRUE" From b99cc1dc45bac101f7e4c184cdcac44d6ae4b270 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 29 Aug 2019 13:27:43 -0600 Subject: [PATCH 2/5] Move hobart testing to izumi --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- cime_config/config_pes.xml | 2 +- cime_config/testdefs/ExpectedTestFails.xml | 14 --- cime_config/testdefs/testlist_clm.xml | 106 ++++++++++----------- doc/.ChangeLog_template | 2 +- python/ctsm/machine_defaults.py | 12 +++ 6 files changed, 68 insertions(+), 70 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 36a87f49f1..306ee7b1f3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ Testing performed, if any: (List what testing you did to show your changes worked as expected) (This can be manual testing or running of the different test suites) (Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide) -(aux_clm on cheyenne for gnu/pgi and hobart for gnu/pgi/nag is the standard for tags on master) +(aux_clm on cheyenne for intel/gnu and izumi for intel/gnu/nag/pgi is the standard for tags on master) **NOTE: Be sure to check your Coding style against the standard:** https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 0d0bbad5b7..9467994e62 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -634,7 +634,7 @@ - + none diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 5058d28aef..d12defc385 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -37,20 +37,6 @@ - - - FAIL - #442 - - - - - - FAIL - #442 - - - FAIL diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 662f0e8403..b546b390a2 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -70,7 +70,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -487,8 +487,8 @@ - - + + @@ -512,7 +512,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -544,7 +544,7 @@ - + @@ -552,7 +552,7 @@ - + @@ -560,7 +560,7 @@ - + @@ -859,7 +859,7 @@ - + @@ -901,7 +901,7 @@ - + @@ -980,7 +980,7 @@ - + @@ -1076,7 +1076,7 @@ - + @@ -1095,9 +1095,9 @@ - - - + + + @@ -1122,9 +1122,9 @@ - - - + + + @@ -1132,8 +1132,8 @@ - - + + @@ -1141,7 +1141,7 @@ - + @@ -1157,7 +1157,7 @@ - + @@ -1169,9 +1169,9 @@ - + - + @@ -1180,7 +1180,7 @@ - + @@ -1198,7 +1198,7 @@ - + @@ -1241,7 +1241,7 @@ - + @@ -1287,7 +1287,7 @@ - + @@ -1330,7 +1330,7 @@ - + @@ -1382,7 +1382,7 @@ - + @@ -1390,7 +1390,7 @@ - + @@ -1449,7 +1449,7 @@ - + @@ -1474,7 +1474,7 @@ - + @@ -1484,7 +1484,7 @@ - + @@ -1493,7 +1493,7 @@ - + @@ -1503,7 +1503,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1530,7 +1530,7 @@ - + @@ -1547,7 +1547,7 @@ - + @@ -1565,7 +1565,7 @@ - + @@ -1583,7 +1583,7 @@ - + @@ -1657,7 +1657,7 @@ - + @@ -1668,7 +1668,7 @@ - + diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template index 12b3640f9a..f5474f33a8 100644 --- a/doc/.ChangeLog_template +++ b/doc/.ChangeLog_template @@ -94,7 +94,7 @@ CTSM testing: regular tests (aux_clm): cheyenne ---- - hobart ------ + izumi ------- If the tag used for baseline comparisons was NOT the previous tag, note that here: diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index 967a3c76ca..f4df95b768 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -52,6 +52,18 @@ '-l select=1:ncpus=36:mpiprocs=1 -r n -l inception=login') }), 'hobart': MachineDefaults( + job_launcher_type=JOB_LAUNCHER_QSUB, + scratch_dir=os.path.join(os.path.sep, 'scratch', 'cluster', get_user()), + baseline_dir=os.path.join(os.path.sep, 'fs', 'cgd', 'csm', 'ccsm_baselines'), + account_required=False, + job_launcher_defaults={ + JOB_LAUNCHER_QSUB: QsubDefaults( + queue='medium', + walltime='04:00:00', + extra_args='', + required_args='-l nodes=1:ppn=48 -r n') + }), + 'izumi': MachineDefaults( job_launcher_type=JOB_LAUNCHER_QSUB, scratch_dir=os.path.join(os.path.sep, 'scratch', 'cluster', get_user()), baseline_dir=os.path.join(os.path.sep, 'fs', 'cgd', 'csm', 'ccsm_baselines'), From f9585d0cdda71230a914fd818d01fce1d2764628 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 29 Aug 2019 16:24:55 -0600 Subject: [PATCH 3/5] Point to updated cime This version of cime adds /cluster/torque/bin to path on izumi, which is needed for run_sys_tests to submit tests from the compute nodes. --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index fc007370ff..36775f16fe 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ required = True local_path = cime protocol = git repo_url = https://github.com/ESMCI/cime -tag = branch_tags/cime5.8.3_chint17-04 +tag = branch_tags/cime5.8.3_chint17-05 required = True [externals_description] From 97fbecda062d72bd9bc6966557d78fb8c9d5f593 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 3 Sep 2019 11:14:01 -0600 Subject: [PATCH 4/5] Also move fates tests from hobart to izumi --- cime_config/testdefs/testlist_clm.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index bfa94e6473..73c04e27f9 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1750,7 +1750,7 @@ - + @@ -1785,7 +1785,7 @@ - + @@ -1803,7 +1803,7 @@ - + From e9b7d2b62f56b6c8265bcf94c853d491381ed61d Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 3 Sep 2019 16:04:35 -0600 Subject: [PATCH 5/5] Update ChangeLog --- doc/ChangeLog | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 113 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 8e3d31fe49..a962ec67e3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,116 @@ =============================================================== +Tag name: ctsm1.0.dev062 +Originator(s): sacks (Bill Sacks) +Date: Tue Sep 3 16:04:28 MDT 2019 +One-line Summary: Move hobart tests to izumi + +Purpose of changes +------------------ + +Move all hobart testing to izumi. + + +Bugs fixed or introduced +------------------------ + +Known bugs introduced in this tag (include github issue ID): +- Recurrence of ESCOMP/ctsm#174 (ne30 case fails on hobart_nag due to floating overflow) + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + + [Put an [X] in the box for any configuration with significant answer changes.] + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + +Notes of particular relevance for users +--------------------------------------- + +Caveats for users (e.g., need to interpolate initial conditions): none + +Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): none + +Changes made to namelist defaults (e.g., changed parameter values): none + +Changes to the datasets (e.g., parameter, surface or initial files): none + +Substantial timing or memory changes: none + +Notes of particular relevance for developers: (including Code reviews and testing) +--------------------------------------------- +NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide + +Caveats for developers (e.g., code that is duplicated that requires double maintenance): +- Testing should now be run on izumi, not hobart + +Changes to tests or testing: +- All hobart tests moved to izumi + +Code reviewed by: self + + +CTSM testing: + + [PASS means all tests PASS and OK means tests PASS other than expected fails.] + + build-namelist tests: + + cheyenne - not run + + tools-tests (test/tools): + + cheyenne - not run + + PTCLM testing (tools/shared/PTCLM/test): + + cheyenne - not run + + python testing (see instructions in python/README.md; document testing done): + + (any machine) - not run + + regular tests (aux_clm): + + cheyenne ---- not run + izumi ------- pass + + Also ran prealpha and prebeta tests that I moved from hobart to izumi. These passed except: + - ERP_D_Ld5.ne30_g16.I1850Clm50BgcCrop.izumi_nag.clm-default (#174) + - ERP_Ld5.f19_g17.I2000Clm50SpRtmFl.izumi_pgi.clm-default + - SMS_D_Ld1.f19_g17.I1850Clm45Cn.izumi_pgi.clm-default + + The last two failed with errors like: + + i011.unified.ucar.edu.44619hfi_userinit: mmap of status page (dabbad0008040000) failed: Operation not permitted + + I wonder if the issue is that multi-node pgi cases don't work on izumi? + +If the tag used for baseline comparisons was NOT the previous tag, note that here: + + +Answer changes +-------------- + +Changes answers relative to baseline: NO + +Detailed list of changes +------------------------ + +List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): +- cime: cime5.8.3_chint17-04 -> cime5.8.3_chint17-05 + Minor change on izumi to allow using run_sys_tests + +Pull Requests that document the changes (include PR ids): none + +=============================================================== +=============================================================== Tag name: ctsm1.0.dev061 Originator(s): erik (Erik Kluzek) Date: Sun Sep 1 22:37:07 MDT 2019 diff --git a/doc/ChangeSum b/doc/ChangeSum index 8fe3b9ab98..b00c6f1bf3 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm1.0.dev062 sacks 09/03/2019 Move hobart tests to izumi ctsm1.0.dev061 erik 09/01/2019 Simple b4b fixes: new params file, remove override_nsrest/anoxia_wtsat, DV deprecated ctsm1.0.dev060 sacks 08/29/2019 In SnowWater, truncate small h2osoi residuals ctsm1.0.dev059 sacks 08/24/2019 Continue adding water tracers to LakeHydrology