Skip to content

Commit

Permalink
ESCOMP tag: cam6_3_145
Browse files Browse the repository at this point in the history
Merge pull request ESCOMP#938 from PUMASDevelopment/katetc/rainevap_pr

cam6_3_145: New PUMAS External with adjusted vapor deposition onto snow
Issue ESCOMP#936 - A one-line change in PUMAS resulting in a new tag for the external. This needs to be merged after the ML PR to cam_development (PR ESCOMP#858 ).

resolves ESCOMP#936

Includes Cheryl's PR
closes ESCOMP#948
Closes ESCOMP#947

Run to confirm the impact of this change is at: NCAR/amwg_dev#445

ESCOMP commit: 452cb5b
  • Loading branch information
Katetc authored and Steve Goldhaber committed Apr 22, 2024
1 parent ca3b169 commit fdab989
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 12 deletions.
80 changes: 80 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,85 @@
===============================================================

Tag name: cam6_3_145
Originator(s): katetc, cacraigucar, andrewgettelman
Date: 05 Jan 2024
One-line Summary: New PUMAS External with adjusted vapor deposition onto snow
Github PR URL: https://github.com/ESCOMP/CAM/pull/938

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

A one-line change in PUMAS resulting in a new tag for the external. Adds a corresponding
limiter for vapor deposition onto snow as used for rain. Also updates the test lists from
Cheyenne to Derecho in all cases.
Resolves Issue 936 - PUMAS update for vapor deposition onto snow
Resolves Issue 947 - Rename all cheyenne tests to derecho

Describe any changes made to build system: None

Describe any changes made to the namelist: None

List any changes to the defaults for the boundary datasets: None

Describe any substantial timing or memory changes: None

Code reviewed by: PeterHjortLauritzen, cacraigucar, adamrher

List all files eliminated: None

List all files added and what they do: None

List all existing files that have been modified, and describe the changes:

M Externals_CAM.cfg
- Point to new pumas tag pumas_cam-release_v1.35

M cime_config/testdefs/testlist_cam.xml
- Change all Cheyenne to Derecho tests
- Change wallclock time from 00:10:00 to 00:20:00 for Derecho test
ERP_Ln9_Vnuopc.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s

M test/system/archive_baseline.sh
- Change cheyenne to Derecho, remove support for Cheyenne

M test/system/test_driver.sh
- Remove support for Cheyenne, updates for Derecho

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:
ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: PEND)
ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
- pre-existing failures

ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
ERP_D_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.F2000dev.derecho_intel.cam-outfrq9s (Overall: DIFF)
ERP_Ln9_Vnuopc.f09_f09_mg17.F2000dev.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF)
ERS_Ld3_Vnuopc.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam_dev (Overall: DIFF)
SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
SMS_D_Ln9_Vnuopc_P1280x1.ne30pg3_ne30pg3_mg17.FCLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
SMS_Ld1_Vnuopc.f19_f19.F2000dev.derecho_intel.cam-outfrq1d (Overall: DIFF)
- Expected answer changes due to PUMAS update

izumi/nag/aux_cam:
DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
- pre-existing failure

izumi/gnu/aux_cam:
SMS_D_Ln9.f10_f10_mg37.2000_CAM%DEV%GHGMAM4_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SESP.izumi_gnu.cam-outfrq9s (Overall: DIFF)
- Expected answer changes due to PUMAS update

Summarize any changes to answers:

Small but climate-changing impacts. Discussion and diagnostics here: https://github.com/NCAR/amwg_dev/issues/445

===============================================================


===============================================================

Tag name: cam6_3_144
Originator(s): katetc, cacraigucar, andrewgettelman, wkchuang, djgagne
Date: 02 Jan 2024
Expand Down
14 changes: 2 additions & 12 deletions test/system/archive_baseline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cat << EOF1
NAME
archive_baseline.sh - archive pretag baselines to set locations on
hobart, izumi and cheyenne.
hobart, izumi and derecho.
SYNOPSIS
Expand All @@ -32,7 +32,7 @@ BASELINE ARCHIVED LOCATION
hobart, izumi: /fs/cgd/csm/models/atm/cam/pretag_bl/TAGNAME_pgi
/fs/cgd/csm/models/atm/cam/pretag_bl/TAGNAME_nag
cheyenne: /glade/p/cesm/amwg/cesm_baselines/TAGNAME
derecho: /glade/campaign/cesm/community/amwg/cam_baselines/TAGNAME
Expand Down Expand Up @@ -93,16 +93,6 @@ case $hostname in
baselinedir="/fs/cgd/csm/models/atm/cam/pretag_bl/$cam_tag"
;;

ch*)
echo "server: cheyenne"
if [ -z "$CAM_FC" ]; then
CAM_FC="INTEL"
fi
test_file_list="tests_pretag_cheyenne"
cam_tag=$1
baselinedir="/glade/p/cesm/amwg/cesm_baselines/$cam_tag"
;;

de*)
echo "server: derecho"
if [ -z "$CAM_FC" ]; then
Expand Down

0 comments on commit fdab989

Please sign in to comment.