From 845fecae778db997eeb4130c9b447449612c9295 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Thu, 29 Sep 2022 10:01:02 -0600 Subject: [PATCH 1/6] Update externals to get fixes --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index b29291a7da..485ec9301c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [ccs_config] -tag = ccs_config_cesm0.0.28 +tag = ccs_config_cesm0.0.44 protocol = git repo_url = https://github.com/ESMCI/ccs_config_cesm local_path = ccs_config @@ -57,7 +57,7 @@ local_path = libraries/mct required = True [parallelio] -tag = pio2_5_7 +tag = pio2_5_9 protocol = git repo_url = https://github.com/NCAR/ParallelIO local_path = libraries/parallelio From 178544a238ec652b7a559ac0baad8e799396e951 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Wed, 5 Oct 2022 09:18:38 -0600 Subject: [PATCH 2/6] Update ccs_config --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 485ec9301c..239f283546 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,5 +1,5 @@ [ccs_config] -tag = ccs_config_cesm0.0.44 +tag = ccs_config_cesm0.0.45 protocol = git repo_url = https://github.com/ESMCI/ccs_config_cesm local_path = ccs_config From 2ddf217b6defb354f60987dbc2351cbf35079f15 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 7 Oct 2022 12:55:13 -0600 Subject: [PATCH 3/6] Fix problem with protected variable nextsw_cday --- src/physics/camrt/radiation.F90 | 4 +++- src/physics/rrtmg/radiation.F90 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/physics/camrt/radiation.F90 b/src/physics/camrt/radiation.F90 index 5dc899a522..7cd74faa11 100644 --- a/src/physics/camrt/radiation.F90 +++ b/src/physics/camrt/radiation.F90 @@ -709,6 +709,7 @@ subroutine radiation_read_restart(file) integer :: dims(3), gdims(3), nhdims integer :: vsize integer :: i + real(r8) :: temp_var type(var_desc_t) :: vardesc character(len=16) :: pname @@ -761,7 +762,8 @@ subroutine radiation_read_restart(file) end if ierr = pio_inq_varid(File, 'nextsw_cday', vardesc) - ierr = pio_get_var(File, vardesc, nextsw_cday) + ierr = pio_get_var(File, vardesc, temp_var) + nextsw_cday = temp_var end subroutine radiation_read_restart diff --git a/src/physics/rrtmg/radiation.F90 b/src/physics/rrtmg/radiation.F90 index b6bb57647e..9e0e9049d1 100644 --- a/src/physics/rrtmg/radiation.F90 +++ b/src/physics/rrtmg/radiation.F90 @@ -688,6 +688,7 @@ subroutine radiation_read_restart(file) integer :: err_handling integer :: ierr + real(r8) :: temp_var type(var_desc_t) :: vardesc !---------------------------------------------------------------------------- @@ -704,7 +705,8 @@ subroutine radiation_read_restart(file) end if ierr = pio_inq_varid(File, 'nextsw_cday', vardesc) - ierr = pio_get_var(File, vardesc, nextsw_cday) + ierr = pio_get_var(File, vardesc, temp_var) + nextsw_cday = temp_var end subroutine radiation_read_restart From 453d8d3d32c93e8ba973a6374709ba28554595ae Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Tue, 11 Oct 2022 15:53:15 -0600 Subject: [PATCH 4/6] Remove problematic MCT tests --- cime_config/testdefs/testlist_cam.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index fffe69590c..a1ebcebdad 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -2017,15 +2017,6 @@ - - - - - - - - - @@ -2051,14 +2042,6 @@ - - - - - - - - From 35d362c80695fb6ebc2f773e5f71f06cef026408 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 14 Oct 2022 09:00:52 -0600 Subject: [PATCH 5/6] Increase time for a regression test --- cime_config/testdefs/testlist_cam.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index a1ebcebdad..20f7a19f99 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -168,7 +168,7 @@ - + From 45e1b52c74db762328bd927259e0e95716702064 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 14 Oct 2022 09:03:57 -0600 Subject: [PATCH 6/6] Update ChangeLog for cam6_3_079 --- doc/ChangeLog | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index a7873f415f..1c1c83f5a2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,65 @@ =============================================================== +Tag name: cam6_3_079 +Originator(s): jedwards, cacraig +Date: Oct 14, 2022 +One-line Summary: variable resolution has irreproducible results (intermittent failure) +Github PR URL: https://github.com/ESCOMP/CAM/pull/666 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - irreproducable results in variable resolution: https://github.com/ESCOMP/CAM/issues/631 + - during testing investigations, a problem with nextsw_cday was discovered and is corrected + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: N/A + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: fvitt, courtneyp, nusbaume + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M Externals.cfg + - update PIO and ccs_config externals to bring in fix for intermittent failure + +M cime_config/testdefs/testlist_cam.xml + - Remove MCT WACCM tests which were have intermittent problems as MCT is being phased out + - Increase time for C96 F2000climo test + +M src/physics/camrt/radiation.F90 +M src/physics/rrtmg/radiation.F90 + - nextsw_cday is a protected variable, but was being modified by an external routine. Fixed + +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. + +cheyenne/intel/aux_cam: all BFB except: + FAIL ERP_Ln9_Vnuopc.ne30_ne30_mg17.FCnudged.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_078: DIFF + FAIL ERS_Ln9_P288x1_Vnuopc.mpasa120_mpasa120.F2000climo.cheyenne_intel.cam-outfrq9s_mpasa120 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_078: DIFF + FAIL ERS_Ln9_P36x1_Vnuopc.mpasa480_mpasa480.F2000climo.cheyenne_intel.cam-outfrq9s_mpasa480 BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_078: DIFF + FAIL SMS_D_Ln9_Vnuopc.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.cheyenne_intel.cam-outfrq9s_refined_camchem BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_078: DIFF + FAIL SMS_D_Ln9_Vnuopc.ne16_ne16_mg17.FX2000.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_078: DIFF + - Differences are due to ESMF update and were confirmed as discussed in issue ESCOMP/CAM #631 + +izumi/nag/aux_cam: all BFB except: + DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details: + FAIL DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae RUN time=11 + - expected failure + +izumi/gnu/aux_cam: all BFB + +=============================================================== +=============================================================== + Tag name:cam6_3_078 Originator(s): stepheba, cacraig Date: Sept 28, 2022