Merge pull request #666 from cacraigucar/cam_fix_irrep_results

cam6_3_079: Fix problems with irreproducible results using variable resolution grids
ESCOMP · Oct 14, 2022 · 96a314f · 96a314f
2 parents caa7353 + 45e1b52
commit 96a314f
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 22 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,5 +1,5 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.28
+tag = ccs_config_cesm0.0.45
 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

diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
@@ -168,7 +168,7 @@
       <machine name="cheyenne" compiler="intel" category="fv3_cam"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:30:00</option>
     </options>
   </test>
 
@@ -2017,15 +2017,6 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="1850_CAM60%WCTS_CLM50%SP_CICE5%PRES_DOCN%DOM_MOSART_SGLC_SWAV" grid="f09_f09_mg17" name="SMS_Ln9_Vmct" testmods="cam/reduced_hist3s">
-    <machines>
-      <machine name="cheyenne" compiler="intel" category="aux_cam"/>
-      <machine name="cheyenne" compiler="intel" category="prealpha"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:10:00</option>
-    </options>
-  </test>
   <test compset="FWHIST_BGC" grid="f09_f09_mg17" name="ERP_Ld3_Vnuopc" testmods="cam/reduced_hist1d">
     <machines>
       <machine name="cheyenne" compiler="intel" category="waccm"/>
@@ -2051,14 +2042,6 @@
       <option name="wallclock">00:40:00</option>
     </options>
   </test>
-  <test compset="HIST_CAM60%WCTS_CLM50%SP_CICE5%PRES_DOCN%DOM_MOSART_SGLC_SWAV" grid="f09_f09_mg17" name="ERP_Ld3_Vmct" testmods="cam/reduced_hist1d">
-    <machines>
-      <machine name="cheyenne" compiler="intel" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:40:00</option>
-    </options>
-  </test>
   <test compset="FWHIST" grid="f09_f09_mg17" name="SMS_D_Ln9_Vnuopc" testmods="cam/reduced_hist3s">
     <machines>
       <machine name="cheyenne" compiler="intel" category="waccm"/>

diff --git 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

diff --git 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
@@ -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