From 2ec915a42c5fa25f3a9fc2815db14e64bbb08be4 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Tue, 10 Sep 2024 08:31:19 -0600 Subject: [PATCH 01/12] add timestamp to rpointer files --- src/control/cam_comp.F90 | 14 +++++++++++--- src/control/cam_initfiles.F90 | 27 +++++++++++++++++---------- src/control/cam_restart.F90 | 32 +++++++++++++++++++------------- src/control/runtime_opts.F90 | 6 +++--- src/cpl/nuopc/atm_comp_nuopc.F90 | 3 +++ 5 files changed, 53 insertions(+), 29 deletions(-) diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90 index a040762067..561129c3db 100644 --- a/src/control/cam_comp.F90 +++ b/src/control/cam_comp.F90 @@ -16,7 +16,7 @@ module cam_comp use spmd_utils, only: masterproc, mpicom use cam_control_mod, only: cam_ctrl_init, cam_ctrl_set_orbit use runtime_opts, only: read_namelist -use time_manager, only: timemgr_init, get_nstep +use time_manager, only: timemgr_init, get_nstep, get_curr_date use camsrfexch, only: cam_out_t, cam_in_t use ppgrid, only: begchunk, endchunk use physics_types, only: physics_state, physics_tend @@ -122,11 +122,11 @@ subroutine cam_init( & integer, intent(in) :: stop_tod ! Stop time of day (sec) integer, intent(in) :: ref_ymd ! Reference date (YYYYMMDD) integer, intent(in) :: ref_tod ! Reference time of day (sec) - type(cam_out_t), pointer :: cam_out(:) ! Output from CAM to surface type(cam_in_t) , pointer :: cam_in(:) ! Merged input state to CAM ! Local variables + integer :: yr, mon, day, tod character(len=cs) :: filein ! Input namelist filename !----------------------------------------------------------------------- @@ -152,7 +152,15 @@ subroutine cam_init( & ! Read CAM namelists. filein = "atm_in" // trim(inst_suffix) - call read_namelist(filein, single_column, scmlat, scmlon) + call get_curr_date(yr, mon, day, tod) + if(len_trim(inst_suffix) > 0) then + restart_pointer_file = interpret_filename_spec("rpointer.cam."//trim(inst_suffix)//".%y-%m-%d-%s", & + yr=yr_spec, mon=mon_spec, day=day_spec, tod= sec_spec ) + else + restart_pointer_file = interpret_filename_spec("rpointer.cam.%y-%m-%d-%s", & + yr=yr_spec, mon=mon_spec, day=day_spec, tod= sec_spec ) + endif + call read_namelist(filein, single_column, scmlat, scmlon, restart_pointer_file=restart_pointer_file) ! Open initial or restart file, and topo file if specified. call cam_initfiles_open() diff --git a/src/control/cam_initfiles.F90 b/src/control/cam_initfiles.F90 index 3b48f1ab0e..6c67125c8d 100644 --- a/src/control/cam_initfiles.F90 +++ b/src/control/cam_initfiles.F90 @@ -42,10 +42,6 @@ module cam_initfiles real(r8), public, protected :: scale_dry_air_mass = 0.0_r8 ! Toggle and target avg air mass for MPAS dycore -! The restart pointer file contains name of most recently written primary restart file. -! The contents of this file are updated by cam_write_restart as new restart files are written. -character(len=cl), public, protected :: rest_pfile - ! Filename for initial restart file. character(len=cl) :: restart_file = ' ' @@ -61,7 +57,7 @@ module cam_initfiles contains !======================================================================================== -subroutine cam_initfiles_readnl(nlfile) +subroutine cam_initfiles_readnl(nlfile, restart_pointer_file) use namelist_utils, only: find_group_name use units, only: getunit, freeunit @@ -70,7 +66,7 @@ subroutine cam_initfiles_readnl(nlfile) use cam_instance, only: inst_suffix character(len=*), intent(in) :: nlfile ! filepath for file containing namelist input - + character(len=*), optional, intent(in) :: restart_pointer_file ! Local variables integer :: unitn, ierr @@ -78,6 +74,10 @@ subroutine cam_initfiles_readnl(nlfile) logical :: filefound integer :: xtype integer(pio_offset_kind) :: slen + logical :: found + + ! The restart pointer file contains name of most recently written primary restart file. + character(len=cl) :: rest_pfile character(len=*), parameter :: sub = 'cam_initfiles_readnl' @@ -112,18 +112,25 @@ subroutine cam_initfiles_readnl(nlfile) call mpi_bcast(scale_dry_air_mass, 1, mpir8, mstrid, mpicom, ierr) if (ierr /= 0) call endrun(sub//": ERROR: mpi_bcast: scale_dry_air_mass") - ! Set pointer file name based on instance suffix - rest_pfile = './rpointer.atm' // trim(inst_suffix) - + if(present(restart_pointer_file)) then + rest_pfile = restart_pointer_file + else + ! Set pointer file name based on instance suffix + rest_pfile = './rpointer.atm' // trim(inst_suffix) + endif ! Set name of primary restart file if (restart_run) then ! Read name of restart file from pointer file if (masterproc) then + inquire(file=trim(rest_pfile),exist=found) + if(.not. found) then + call endrun(sub // ': ERROR: rpointer file: '//trim(rest_pfile) // ' not found') + endif unitn = getunit() call opnfil(rest_pfile, unitn, 'f', status="old") read (unitn, '(a)', iostat=ierr) restart_file if (ierr /= 0) then - call endrun(sub // ': ERROR: reading rpointer file') + call endrun(sub // ': ERROR: reading rpointer file: '//trim(rest_pfile)) end if close(unitn) call freeunit(unitn) diff --git a/src/control/cam_restart.F90 b/src/control/cam_restart.F90 index 124cf3b4b5..41463c71f9 100644 --- a/src/control/cam_restart.F90 +++ b/src/control/cam_restart.F90 @@ -132,38 +132,44 @@ subroutine cam_write_restart(cam_in, cam_out, dyn_out, pbuf2d, & call ionosphere_write_restart(fh) call write_restart_physics(fh, cam_in, cam_out, pbuf2d) - if (present(yr_spec).and.present(mon_spec).and.& - present(day_spec).and.present(sec_spec)) then - call write_restart_history(fh, yr_spec=yr_spec, mon_spec=mon_spec, & - day_spec=day_spec, sec_spec= sec_spec ) - else - call write_restart_history(fh) - end if + call write_restart_history(fh, yr_spec=yr_spec, mon_spec=mon_spec, & + day_spec=day_spec, sec_spec= sec_spec ) ! Close the primary restart file call pio_closefile(fh) ! Update the restart pointer file - call write_rest_pfile(fname) + call write_rest_pfile(fname, yr_spec=yr_spec, mon_spec=mon_spec, & + day_spec=day_spec, sec_spec= sec_spec ) end subroutine cam_write_restart !======================================================================================== -subroutine write_rest_pfile(restart_file) +subroutine write_rest_pfile(restart_file, yr_spec, mon_spec, day_spec, sec_spec) ! Write the restart pointer file - - use cam_initfiles, only: rest_pfile - + use cam_instance, only: inst_suffix + use filenames, only: interpret_filename_spec character(len=*), intent(in) :: restart_file + integer, optional, intent(in) :: yr_spec ! Simulation year + integer, optional, intent(in) :: mon_spec ! Simulation month + integer, optional, intent(in) :: day_spec ! Simulation day + integer, optional, intent(in) :: sec_spec ! Seconds into current simulation day integer :: nsds, ierr + character(len=CL) :: rest_pfile character(len=*), parameter :: sub='write_rest_pfile' !--------------------------------------------------------------------------- if (masterproc) then - + if(inst_suffix .ne. "") then + rest_pfile = interpret_filename_spec('rpointer.cpl.%y-%m-%d-%s',& + yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) + else + rest_pfile = interpret_filename_spec('rpointer.cpl.'//trim(inst_suffix)//'.'//'%y-%m-%d-%s',& + yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) + endif nsds = getunit() call opnfil(rest_pfile, nsds, 'f') rewind nsds diff --git a/src/control/runtime_opts.F90 b/src/control/runtime_opts.F90 index 915664cdb9..0a8c48b509 100644 --- a/src/control/runtime_opts.F90 +++ b/src/control/runtime_opts.F90 @@ -19,7 +19,7 @@ module runtime_opts contains !======================================================================= -subroutine read_namelist(nlfilename, single_column, scmlat, scmlon) +subroutine read_namelist(nlfilename, single_column, scmlat, scmlon, restart_pointer_file) use cam_initfiles, only: cam_initfiles_readnl use constituents, only: cnst_readnl @@ -109,7 +109,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon) logical, intent(in) :: single_column real(r8), intent(in) :: scmlat real(r8), intent(in) :: scmlon - + character(len=*), optional, intent(in) :: restart_pointer_file !---------------------------Local variables----------------------------- character(len=*), parameter :: subname = "read_namelist" @@ -133,7 +133,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon) !++bee 13 Oct 2015, need to fix the pbuf_global_allocate functionality, then ! can uncomment the pbuf_readnl line ! call pbuf_readnl(nlfilename) - call cam_initfiles_readnl(nlfilename) + call cam_initfiles_readnl(nlfilename, restart_pointer_file=restart_pointer_file) call cnst_readnl(nlfilename) call history_readnl(nlfilename) call chem_surfvals_readnl(nlfilename) diff --git a/src/cpl/nuopc/atm_comp_nuopc.F90 b/src/cpl/nuopc/atm_comp_nuopc.F90 index 8b2ba903d0..927a300bae 100644 --- a/src/cpl/nuopc/atm_comp_nuopc.F90 +++ b/src/cpl/nuopc/atm_comp_nuopc.F90 @@ -1976,6 +1976,9 @@ subroutine cam_write_clockrest( clock, yr_spec, mon_spec, day_spec, sec_spec, rc yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) if (masterproc) then + restart_pfile = interpret_filename_spec('rpointer.cpl.%y-%m-%d-%s',& + yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) + write(iulog,*) " In this configuration, there is no mediator" write(iulog,*) " Normally, the mediator restart file provides the restart time info" write(iulog,*) " In this case, CAM will create the rpointer.cpl and cpl restart file" From 230a84a552e7c4add07ec21f32e4d68ff109b61e Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Tue, 10 Sep 2024 15:23:27 -0600 Subject: [PATCH 02/12] add rpointer timestamp to cam --- src/control/cam_comp.F90 | 13 ++++++++----- src/control/cam_restart.F90 | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90 index 561129c3db..66adf3b614 100644 --- a/src/control/cam_comp.F90 +++ b/src/control/cam_comp.F90 @@ -16,7 +16,7 @@ module cam_comp use spmd_utils, only: masterproc, mpicom use cam_control_mod, only: cam_ctrl_init, cam_ctrl_set_orbit use runtime_opts, only: read_namelist -use time_manager, only: timemgr_init, get_nstep, get_curr_date +use time_manager, only: timemgr_init, get_nstep, get_prev_date use camsrfexch, only: cam_out_t, cam_in_t use ppgrid, only: begchunk, endchunk use physics_types, only: physics_state, physics_tend @@ -87,7 +87,7 @@ subroutine cam_init( & use cam_snapshot_common, only: cam_snapshot_deactivate use air_composition, only: air_composition_init use phys_grid_ctem, only: phys_grid_ctem_reg - + use filenames, only: interpret_filename_spec ! Arguments character(len=cl), intent(in) :: caseid ! case ID character(len=cl), intent(in) :: ctitle ! case title @@ -126,6 +126,7 @@ subroutine cam_init( & type(cam_in_t) , pointer :: cam_in(:) ! Merged input state to CAM ! Local variables + character(len=cl) :: restart_pointer_file integer :: yr, mon, day, tod character(len=cs) :: filein ! Input namelist filename !----------------------------------------------------------------------- @@ -152,14 +153,16 @@ subroutine cam_init( & ! Read CAM namelists. filein = "atm_in" // trim(inst_suffix) - call get_curr_date(yr, mon, day, tod) + call get_prev_date(yr, mon, day, tod) if(len_trim(inst_suffix) > 0) then restart_pointer_file = interpret_filename_spec("rpointer.cam."//trim(inst_suffix)//".%y-%m-%d-%s", & - yr=yr_spec, mon=mon_spec, day=day_spec, tod= sec_spec ) + yr_spec=yr, mon_spec=mon, day_spec=day, sec_spec=tod ) else restart_pointer_file = interpret_filename_spec("rpointer.cam.%y-%m-%d-%s", & - yr=yr_spec, mon=mon_spec, day=day_spec, tod= sec_spec ) + yr_spec=yr, mon_spec=mon, day_spec=day, sec_spec=tod ) + endif + print *,__FILE__,__LINE__,trim(restart_pointer_file) call read_namelist(filein, single_column, scmlat, scmlon, restart_pointer_file=restart_pointer_file) ! Open initial or restart file, and topo file if specified. diff --git a/src/control/cam_restart.F90 b/src/control/cam_restart.F90 index 41463c71f9..02cb97b8c5 100644 --- a/src/control/cam_restart.F90 +++ b/src/control/cam_restart.F90 @@ -163,11 +163,11 @@ subroutine write_rest_pfile(restart_file, yr_spec, mon_spec, day_spec, sec_spec) !--------------------------------------------------------------------------- if (masterproc) then - if(inst_suffix .ne. "") then - rest_pfile = interpret_filename_spec('rpointer.cpl.%y-%m-%d-%s',& + if(len_trim(inst_suffix) > 0) then + rest_pfile = interpret_filename_spec('rpointer.cam.'//trim(inst_suffix)//'.'//'%y-%m-%d-%s',& yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) else - rest_pfile = interpret_filename_spec('rpointer.cpl.'//trim(inst_suffix)//'.'//'%y-%m-%d-%s',& + rest_pfile = interpret_filename_spec('rpointer.cam.%y-%m-%d-%s',& yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) endif nsds = getunit() From e00353cf02df9e0957b0a515fef024454ab5773d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 12 Sep 2024 07:27:50 -0600 Subject: [PATCH 03/12] simplify rpointer naming --- src/control/cam_comp.F90 | 15 ++------------- src/control/cam_initfiles.F90 | 22 +++++++++++----------- src/control/cam_restart.F90 | 17 ++++------------- src/control/runtime_opts.F90 | 5 ++--- 4 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90 index 66adf3b614..3eb94f041a 100644 --- a/src/control/cam_comp.F90 +++ b/src/control/cam_comp.F90 @@ -16,7 +16,7 @@ module cam_comp use spmd_utils, only: masterproc, mpicom use cam_control_mod, only: cam_ctrl_init, cam_ctrl_set_orbit use runtime_opts, only: read_namelist -use time_manager, only: timemgr_init, get_nstep, get_prev_date +use time_manager, only: timemgr_init, get_nstep use camsrfexch, only: cam_out_t, cam_in_t use ppgrid, only: begchunk, endchunk use physics_types, only: physics_state, physics_tend @@ -126,8 +126,6 @@ subroutine cam_init( & type(cam_in_t) , pointer :: cam_in(:) ! Merged input state to CAM ! Local variables - character(len=cl) :: restart_pointer_file - integer :: yr, mon, day, tod character(len=cs) :: filein ! Input namelist filename !----------------------------------------------------------------------- @@ -153,17 +151,8 @@ subroutine cam_init( & ! Read CAM namelists. filein = "atm_in" // trim(inst_suffix) - call get_prev_date(yr, mon, day, tod) - if(len_trim(inst_suffix) > 0) then - restart_pointer_file = interpret_filename_spec("rpointer.cam."//trim(inst_suffix)//".%y-%m-%d-%s", & - yr_spec=yr, mon_spec=mon, day_spec=day, sec_spec=tod ) - else - restart_pointer_file = interpret_filename_spec("rpointer.cam.%y-%m-%d-%s", & - yr_spec=yr, mon_spec=mon, day_spec=day, sec_spec=tod ) - endif - print *,__FILE__,__LINE__,trim(restart_pointer_file) - call read_namelist(filein, single_column, scmlat, scmlon, restart_pointer_file=restart_pointer_file) + call read_namelist(filein, single_column, scmlat, scmlon) ! Open initial or restart file, and topo file if specified. call cam_initfiles_open() diff --git a/src/control/cam_initfiles.F90 b/src/control/cam_initfiles.F90 index 6c67125c8d..d44d5030e1 100644 --- a/src/control/cam_initfiles.F90 +++ b/src/control/cam_initfiles.F90 @@ -57,19 +57,19 @@ module cam_initfiles contains !======================================================================================== -subroutine cam_initfiles_readnl(nlfile, restart_pointer_file) +subroutine cam_initfiles_readnl(nlfile) use namelist_utils, only: find_group_name use units, only: getunit, freeunit use spmd_utils, only: mpicom, mstrid=>masterprocid, mpir8=>mpi_real8, & mpichar=>mpi_character, mpi_logical use cam_instance, only: inst_suffix - + use filenames, only: interpret_filename_spec + character(len=*), intent(in) :: nlfile ! filepath for file containing namelist input - character(len=*), optional, intent(in) :: restart_pointer_file + ! Local variables integer :: unitn, ierr - character(len=cl) :: locfn logical :: filefound integer :: xtype @@ -112,19 +112,19 @@ subroutine cam_initfiles_readnl(nlfile, restart_pointer_file) call mpi_bcast(scale_dry_air_mass, 1, mpir8, mstrid, mpicom, ierr) if (ierr /= 0) call endrun(sub//": ERROR: mpi_bcast: scale_dry_air_mass") - if(present(restart_pointer_file)) then - rest_pfile = restart_pointer_file - else - ! Set pointer file name based on instance suffix - rest_pfile = './rpointer.atm' // trim(inst_suffix) - endif ! Set name of primary restart file if (restart_run) then ! Read name of restart file from pointer file if (masterproc) then + rest_pfile = interpret_filename_spec("rpointer.cam"//trim(inst_suffix)//".%y-%m-%d-%s", prev=.true.) inquire(file=trim(rest_pfile),exist=found) if(.not. found) then - call endrun(sub // ': ERROR: rpointer file: '//trim(rest_pfile) // ' not found') + write(iulog, "Warning : rpointer file "//trim(rest_pfile)//" not found.") + rest_pfile = "rpointer.cam"//trim(inst_suffix) + inquire(file=trim(rest_pfile),exist=found) + if(.not. found) then + call endrun(sub // ': ERROR: rpointer file: '//trim(rest_pfile) // ' not found') + endif endif unitn = getunit() call opnfil(rest_pfile, unitn, 'f', status="old") diff --git a/src/control/cam_restart.F90 b/src/control/cam_restart.F90 index 02cb97b8c5..35087aa89b 100644 --- a/src/control/cam_restart.F90 +++ b/src/control/cam_restart.F90 @@ -106,12 +106,8 @@ subroutine cam_write_restart(cam_in, cam_out, dyn_out, pbuf2d, & ! (%c = caseid, $y = year, $m = month, $d = day, $s = seconds in day, %t = number) rfilename_spec = '%c.cam' // trim(inst_suffix) //'.r.%y-%m-%d-%s.nc' - if (present(yr_spec).and.present(mon_spec).and.present(day_spec).and.present(sec_spec)) then - fname = interpret_filename_spec( rfilename_spec, & - yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) - else - fname = interpret_filename_spec( rfilename_spec ) - end if + fname = interpret_filename_spec( rfilename_spec, & + yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) call cam_pio_createfile(fh, trim(fname), 0) ierr = cam_pio_set_fill(fh) @@ -163,13 +159,8 @@ subroutine write_rest_pfile(restart_file, yr_spec, mon_spec, day_spec, sec_spec) !--------------------------------------------------------------------------- if (masterproc) then - if(len_trim(inst_suffix) > 0) then - rest_pfile = interpret_filename_spec('rpointer.cam.'//trim(inst_suffix)//'.'//'%y-%m-%d-%s',& - yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) - else - rest_pfile = interpret_filename_spec('rpointer.cam.%y-%m-%d-%s',& - yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) - endif + rest_pfile = interpret_filename_spec('rpointer.cam'//trim(inst_suffix)//'.'//'%y-%m-%d-%s',& + yr_spec=yr_spec, mon_spec=mon_spec, day_spec=day_spec, sec_spec= sec_spec ) nsds = getunit() call opnfil(rest_pfile, nsds, 'f') rewind nsds diff --git a/src/control/runtime_opts.F90 b/src/control/runtime_opts.F90 index 0a8c48b509..19cff5c884 100644 --- a/src/control/runtime_opts.F90 +++ b/src/control/runtime_opts.F90 @@ -19,7 +19,7 @@ module runtime_opts contains !======================================================================= -subroutine read_namelist(nlfilename, single_column, scmlat, scmlon, restart_pointer_file) +subroutine read_namelist(nlfilename, single_column, scmlat, scmlon) use cam_initfiles, only: cam_initfiles_readnl use constituents, only: cnst_readnl @@ -109,7 +109,6 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon, restart_poin logical, intent(in) :: single_column real(r8), intent(in) :: scmlat real(r8), intent(in) :: scmlon - character(len=*), optional, intent(in) :: restart_pointer_file !---------------------------Local variables----------------------------- character(len=*), parameter :: subname = "read_namelist" @@ -133,7 +132,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon, restart_poin !++bee 13 Oct 2015, need to fix the pbuf_global_allocate functionality, then ! can uncomment the pbuf_readnl line ! call pbuf_readnl(nlfilename) - call cam_initfiles_readnl(nlfilename, restart_pointer_file=restart_pointer_file) + call cam_initfiles_readnl(nlfilename) call cnst_readnl(nlfilename) call history_readnl(nlfilename) call chem_surfvals_readnl(nlfilename) From e67008e34f1d9aa5789b38975fda7f8ad4a80bb7 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 30 Sep 2024 15:51:08 -0600 Subject: [PATCH 04/12] update from utils to status for newer cime versions --- src/cpl/nuopc/atm_comp_nuopc.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpl/nuopc/atm_comp_nuopc.F90 b/src/cpl/nuopc/atm_comp_nuopc.F90 index 927a300bae..5b16968c44 100644 --- a/src/cpl/nuopc/atm_comp_nuopc.F90 +++ b/src/cpl/nuopc/atm_comp_nuopc.F90 @@ -1967,8 +1967,8 @@ subroutine cam_write_clockrest( clock, yr_spec, mon_spec, day_spec, sec_spec, rc call shr_cal_ymd2date(yy,mm,dd,start_ymd) call ESMF_TimeGet( nextTime, yy=yy, mm=mm, dd=dd, s=curr_tod, rc=rc ) - !call ESMF_TimeGet( currTime, yy=yy, mm=mm, dd=dd, s=curr_tod, rc=rc ) if (ChkErr(rc,__LINE__,u_FILE_u)) return + call shr_cal_ymd2date(yy,mm,dd,curr_ymd) ! Open clock info restart dataset From 880dd3e70c35905414412dc9ebbed07263c4be46 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 3 Oct 2024 11:48:28 -0600 Subject: [PATCH 05/12] remove whitespace changes, correct issue in atm_comp_nuopc --- src/control/cam_comp.F90 | 4 ++-- src/control/cam_initfiles.F90 | 3 ++- src/control/runtime_opts.F90 | 1 + src/cpl/nuopc/atm_comp_nuopc.F90 | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90 index 3eb94f041a..a040762067 100644 --- a/src/control/cam_comp.F90 +++ b/src/control/cam_comp.F90 @@ -87,7 +87,7 @@ subroutine cam_init( & use cam_snapshot_common, only: cam_snapshot_deactivate use air_composition, only: air_composition_init use phys_grid_ctem, only: phys_grid_ctem_reg - use filenames, only: interpret_filename_spec + ! Arguments character(len=cl), intent(in) :: caseid ! case ID character(len=cl), intent(in) :: ctitle ! case title @@ -122,6 +122,7 @@ subroutine cam_init( & integer, intent(in) :: stop_tod ! Stop time of day (sec) integer, intent(in) :: ref_ymd ! Reference date (YYYYMMDD) integer, intent(in) :: ref_tod ! Reference time of day (sec) + type(cam_out_t), pointer :: cam_out(:) ! Output from CAM to surface type(cam_in_t) , pointer :: cam_in(:) ! Merged input state to CAM @@ -151,7 +152,6 @@ subroutine cam_init( & ! Read CAM namelists. filein = "atm_in" // trim(inst_suffix) - call read_namelist(filein, single_column, scmlat, scmlon) ! Open initial or restart file, and topo file if specified. diff --git a/src/control/cam_initfiles.F90 b/src/control/cam_initfiles.F90 index d44d5030e1..08de6340ad 100644 --- a/src/control/cam_initfiles.F90 +++ b/src/control/cam_initfiles.F90 @@ -119,8 +119,9 @@ subroutine cam_initfiles_readnl(nlfile) rest_pfile = interpret_filename_spec("rpointer.cam"//trim(inst_suffix)//".%y-%m-%d-%s", prev=.true.) inquire(file=trim(rest_pfile),exist=found) if(.not. found) then - write(iulog, "Warning : rpointer file "//trim(rest_pfile)//" not found.") + write(iulog, "INFO : rpointer file "//trim(rest_pfile)//" not found.") rest_pfile = "rpointer.cam"//trim(inst_suffix) + write(iulog, " Try looking for "//trim(rest_pfile)//" ...") inquire(file=trim(rest_pfile),exist=found) if(.not. found) then call endrun(sub // ': ERROR: rpointer file: '//trim(rest_pfile) // ' not found') diff --git a/src/control/runtime_opts.F90 b/src/control/runtime_opts.F90 index 19cff5c884..915664cdb9 100644 --- a/src/control/runtime_opts.F90 +++ b/src/control/runtime_opts.F90 @@ -109,6 +109,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon) logical, intent(in) :: single_column real(r8), intent(in) :: scmlat real(r8), intent(in) :: scmlon + !---------------------------Local variables----------------------------- character(len=*), parameter :: subname = "read_namelist" diff --git a/src/cpl/nuopc/atm_comp_nuopc.F90 b/src/cpl/nuopc/atm_comp_nuopc.F90 index 5b16968c44..8faf60fc79 100644 --- a/src/cpl/nuopc/atm_comp_nuopc.F90 +++ b/src/cpl/nuopc/atm_comp_nuopc.F90 @@ -1985,7 +1985,7 @@ subroutine cam_write_clockrest( clock, yr_spec, mon_spec, day_spec, sec_spec, rc write(iulog,*) " containing this information" write(iulog,*) " writing rpointer file for driver clock info, rpointer.cpl" write(iulog,*) " writing restart clock info for driver= "//trim(restart_file) - open(newunit=unitn, file='rpointer.cpl', form='FORMATTED') + open(newunit=unitn, file=trim(restart_pfile), form='FORMATTED') write(unitn,'(a)') trim(restart_file) close(unitn) endif From 0007c77f803399c58080c4b4b640c528ab6f5b75 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 17 Oct 2024 12:53:00 -0600 Subject: [PATCH 06/12] reverse alarm initialization to support alarm_restart at end of run --- src/cpl/nuopc/atm_comp_nuopc.F90 | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/cpl/nuopc/atm_comp_nuopc.F90 b/src/cpl/nuopc/atm_comp_nuopc.F90 index 8faf60fc79..bfde73912d 100644 --- a/src/cpl/nuopc/atm_comp_nuopc.F90 +++ b/src/cpl/nuopc/atm_comp_nuopc.F90 @@ -1296,51 +1296,51 @@ subroutine ModelSetRunClock(gcomp, rc) call ESMF_LogWrite(subname//'setting alarms for' // trim(name), ESMF_LOGMSG_INFO) !---------------- - ! Restart alarm + ! Stop alarm !---------------- - call NUOPC_CompAttributeGet(gcomp, name="restart_option", value=restart_option, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="stop_option", value=stop_option, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call NUOPC_CompAttributeGet(gcomp, name="restart_n", value=cvalue, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="stop_n", value=cvalue, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - read(cvalue,*) restart_n + read(cvalue,*) stop_n - call NUOPC_CompAttributeGet(gcomp, name="restart_ymd", value=cvalue, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="stop_ymd", value=cvalue, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - read(cvalue,*) restart_ymd + read(cvalue,*) stop_ymd - call alarmInit(mclock, restart_alarm, restart_option, & - opt_n = restart_n, & - opt_ymd = restart_ymd, & + call alarmInit(mclock, stop_alarm, stop_option, & + opt_n = stop_n, & + opt_ymd = stop_ymd, & RefTime = mcurrTime, & - alarmname = 'alarm_restart', rc=rc) + alarmname = 'alarm_stop', rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call ESMF_AlarmSet(restart_alarm, clock=mclock, rc=rc) + call ESMF_AlarmSet(stop_alarm, clock=mclock, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return !---------------- - ! Stop alarm + ! Restart alarm !---------------- - call NUOPC_CompAttributeGet(gcomp, name="stop_option", value=stop_option, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="restart_option", value=restart_option, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call NUOPC_CompAttributeGet(gcomp, name="stop_n", value=cvalue, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="restart_n", value=cvalue, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - read(cvalue,*) stop_n + read(cvalue,*) restart_n - call NUOPC_CompAttributeGet(gcomp, name="stop_ymd", value=cvalue, rc=rc) + call NUOPC_CompAttributeGet(gcomp, name="restart_ymd", value=cvalue, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - read(cvalue,*) stop_ymd + read(cvalue,*) restart_ymd - call alarmInit(mclock, stop_alarm, stop_option, & - opt_n = stop_n, & - opt_ymd = stop_ymd, & + call alarmInit(mclock, restart_alarm, restart_option, & + opt_n = restart_n, & + opt_ymd = restart_ymd, & RefTime = mcurrTime, & - alarmname = 'alarm_stop', rc=rc) + alarmname = 'alarm_restart', rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return - call ESMF_AlarmSet(stop_alarm, clock=mclock, rc=rc) + call ESMF_AlarmSet(restart_alarm, clock=mclock, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return end if From 3aa74633894adc742e7e0590a9786d5c8f9be6a4 Mon Sep 17 00:00:00 2001 From: peverwhee Date: Wed, 4 Dec 2024 14:01:54 -0700 Subject: [PATCH 07/12] update to head of cam_development; update cime and share externals --- .gitmodules | 4 ++-- cime | 2 +- share | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 817bb1ff6b..7fed08dbb7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,7 +151,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.41 +fxtag = cime6.1.47 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime @@ -172,7 +172,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git [submodule "share"] path = share url = https://github.com/ESCOMP/CESM_share -fxtag = share1.1.2 +fxtag = share1.1.4 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share diff --git a/cime b/cime index 1236c0fede..f28506021f 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 1236c0feded460aef3e5bdba18e4b850f1997346 +Subproject commit f28506021f122fbfab8fea741da35ac48ab875b2 diff --git a/share b/share index f6f31fd61c..63ae6cc216 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit f6f31fd61cb8f80aee97311fcca64b3e26b0202c +Subproject commit 63ae6cc216c517d3ced4d3466d3616b4c24107b5 From 5865cd8aed0fb0e6f2ac784ea9f9fe9564fd56bc Mon Sep 17 00:00:00 2001 From: peverwhee Date: Tue, 17 Dec 2024 10:04:00 -0700 Subject: [PATCH 08/12] update externals; use temp ctsm tag --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7fed08dbb7..f72ec58ae7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,14 +151,14 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.47 +fxtag = cime6.1.49 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps1.0.22 +fxtag = cmeps1.0.32 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git @@ -172,7 +172,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git [submodule "share"] path = share url = https://github.com/ESCOMP/CESM_share -fxtag = share1.1.4 +fxtag = share1.1.6 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share @@ -192,8 +192,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE [submodule "clm"] path = components/clm -url = https://github.com/ESCOMP/CTSM -fxtag = ctsm5.3.002 +url = https://github.com/jedwards4b/CTSM +fxtag = 14aad99fea41c4bef32205494290a675200d3058 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CTSM From f040c7cf8df27df25950c6c529a16cf273bb4d67 Mon Sep 17 00:00:00 2001 From: Courtney Peverley Date: Tue, 17 Dec 2024 13:57:40 -0700 Subject: [PATCH 09/12] update cdeps external --- .gitmodules | 2 +- cime | 2 +- components/cdeps | 2 +- components/clm | 2 +- components/cmeps | 2 +- share | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index f72ec58ae7..c1e9973a6a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -165,7 +165,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.53 +fxtag = cdeps1.0.61 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git diff --git a/cime b/cime index f28506021f..b2f271b174 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit f28506021f122fbfab8fea741da35ac48ab875b2 +Subproject commit b2f271b1742533715a05701b1bdd80a24bb2ad77 diff --git a/components/cdeps b/components/cdeps index f6bc97483a..0750c91753 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit f6bc97483a1bfb7352c6c5610a13ed898a86990b +Subproject commit 0750c9175395d3ba3bf8eba65703dee230d08572 diff --git a/components/clm b/components/clm index 16cf4ac469..14aad99fea 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 16cf4ac469614f4b329c7da206c3d6b9b773bb03 +Subproject commit 14aad99fea41c4bef32205494290a675200d3058 diff --git a/components/cmeps b/components/cmeps index 1355710f04..a91cedfe58 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 1355710f04fa6286a13e8056e35c6736e7250e3d +Subproject commit a91cedfe58658a9fc391195481137a2d83372c25 diff --git a/share b/share index 63ae6cc216..a48ff8790a 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 63ae6cc216c517d3ced4d3466d3616b4c24107b5 +Subproject commit a48ff8790a21d3831873ed9f023a43c606a1ef03 From 2120003618a88ea7642e981a0c1b780b69be60b9 Mon Sep 17 00:00:00 2001 From: peverwhee Date: Thu, 19 Dec 2024 16:39:35 -0700 Subject: [PATCH 10/12] update clm tag --- .gitmodules | 4 ++-- components/clm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index c1e9973a6a..0176e8431c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -192,8 +192,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE [submodule "clm"] path = components/clm -url = https://github.com/jedwards4b/CTSM -fxtag = 14aad99fea41c4bef32205494290a675200d3058 +url = https://github.com/ESCOMP/CTSM +fxtag = ctsm5.3.016 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESCOMP/CTSM diff --git a/components/clm b/components/clm index 14aad99fea..f437651ee4 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 14aad99fea41c4bef32205494290a675200d3058 +Subproject commit f437651ee449789af9325882bb0acc09576c9411 From ee5b5400f28814297bf80a3428bdac30a91d237a Mon Sep 17 00:00:00 2001 From: peverwhee Date: Thu, 19 Dec 2024 17:18:05 -0700 Subject: [PATCH 11/12] initial changelog --- doc/ChangeLog | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 746fead140..7fb8dacc70 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,74 @@ =============================================================== +Tag name: cam6_4_048 +Originator(s): jedwards4b, peverwhee +Date: 20 December 2024 +One-line Summary: Timestamp in rpointer name +Github PR URL: https://github.com/ESCOMP/CAM/pull/1147 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): +#1146 - Add timestep to rpointer file name +- Updates to externals, nuopc cap, and cam control code to handle timestamp in +rpointer file + +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: brian-eaton + +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 .gitmodules +- update cmeps, cdeps, cime, share, clm externals + +M src/control/cam_initfiles.F90 +- look for new timestamped rpointer file + +M src/control/cam_restart.F90 +- remove unnecessary conditionals for optional variables + +M src/cpl/nuopc/atm_comp_nuopc.F90 +- update variable names coming from coupler + +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: + +SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL) +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) + - pre-existing failures due to build-namelist error requiring CLM/CTSM external update. + +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) +SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) + - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856 + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) + - pre-existing failure -- issue #670 + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers: + +=============================================================== + Tag name: cam6_4_047 Originator(s): jedwards4b, fvitt Date: 19 November 2024 From 19f0d962144bfc9d8cd41a0fe98d6db79aa67ec1 Mon Sep 17 00:00:00 2001 From: peverwhee Date: Fri, 20 Dec 2024 16:17:21 -0700 Subject: [PATCH 12/12] updated changelog --- doc/ChangeLog | 82 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 75 insertions(+), 7 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 7fb8dacc70..cf2aa2517d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -27,7 +27,12 @@ List all files added and what they do: N/A List all existing files that have been modified, and describe the changes: M .gitmodules -- update cmeps, cdeps, cime, share, clm externals +- update externals for rpointer mods + - cime6.1.49 + - cmeps1.0.32 + - cdeps1.0.61 + - share1.1.6 + - ctsm5.3.016 M src/control/cam_initfiles.F90 - look for new timestamped rpointer file @@ -45,6 +50,64 @@ appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: +ERC_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq3s_cosp (Overall: NLFAIL) details: +ERC_D_Ln9.f19_f19_mg17.QPMOZ.derecho_intel.cam-outfrq3s (Overall: NLFAIL) details: +ERC_D_Ln9.f19_f19_mg17.QPX2000.derecho_intel.cam-outfrq3s (Overall: NLFAIL) details: +ERC_D_Ln9.ne16_ne16_mg17.FADIAB.derecho_intel.cam-terminator (Overall: NLFAIL) details: +ERC_D_Ln9.ne16_ne16_mg17.QPC5HIST.derecho_intel.cam-outfrq3s_usecase (Overall: NLFAIL) details: +ERC_D_Ln9_P144x1.ne16pg3_ne16pg3_mg17.QPC6HIST.derecho_intel.cam-outfrq3s_ttrac_usecase (Overall: NLFAIL) details: +ERC_D_Ln9.T42_T42_mg17.FDABIP04.derecho_intel.cam-outfrq3s_usecase (Overall: NLFAIL) details: +ERC_D_Ln9.T42_T42_mg17.FHS94.derecho_intel.cam-outfrq3s_usecase (Overall: NLFAIL) details: +ERI_D_Ln18.f45_f45_mg37.QPC41850.derecho_intel.cam-co2rmp_usecase (Overall: NLFAIL) details: +ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details: +ERP_D_Ln9_P64x2.f09_f09_mg17.QSC6.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details: +ERP_Ld3.f09_f09_mg17.FWHIST.derecho_intel.cam-reduced_hist1d (Overall: NLFAIL) details: +ERS_Ln9.ne0TESTONLYne5x4_ne0TESTONLYne5x4_mg37.FADIAB.derecho_intel.cam-outfrq3s_refined (Overall: NLFAIL) details: +SCT_D_Ln7.ne3_ne3_mg37.QPC5.derecho_intel.cam-scm_prep (Overall: NLFAIL) details: +SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep (Overall: NLFAIL) details: +SMS_D_Ld2.f19_f19_mg17.QPC5HIST.derecho_intel.cam-volc_usecase (Overall: NLFAIL) details: +SMS_D_Ld5.f19_f19_mg17.PC4.derecho_intel.cam-cam4_port5d (Overall: NLFAIL) details: +SMS_D_Ln9.f19_f19_mg17.QPC2000climo.derecho_intel.cam-outfrq3s_usecase (Overall: NLFAIL) details: +SMS_D_Ln9.f19_f19_mg17.QPC5M7.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details: +SMS_D_Ln9.ne16_ne16_mg17.QPX2000.derecho_intel.cam-outfrq9s (Overall: NLFAIL) details: +SMS_Ld5.f09_f09_mg17.PC6.derecho_intel.cam-cam6_port_f09 (Overall: NLFAIL) details: +SMS_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-nudging (Overall: NLFAIL) details: +SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s (Overall: NLFAIL) details: +SMS_Ln9.f19_f19.F2000climo.derecho_intel.cam-silhs (Overall: NLFAIL) details: + - NL diffs due to CMEPS & CTSM external updates + +ERP_D_Ln9.ne30pg3_ne30pg3_mg17.FLTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ld3.ne30pg3_ne30pg3_mg17.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details: +ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h (Overall: DIFF) details: +ERP_Ln9.C96_C96_mg17.F2000climo.derecho_intel.cam-outfrq9s_mg3 (Overall: DIFF) details: +ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.f09_f09_mg17.F2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.f09_f09_mg17.F2010climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.f09_f09_mg17.FHIST_BDRD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.f19_f19_mg17.FWsc1850.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERP_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERS_Ln9.f19_f19_mg17.FSPCAMS.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details: +SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details: +SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9.f09_f09_mg17.FSD.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4 (Overall: DIFF) details: +SMS_D_Ln9.ne16pg3_ne16pg3_mg17.FX2000.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9.ne30pg3_ne30pg3_mg17.FMTHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details: +SMS_D_Ln9.T42_T42.FSCAMARM97.derecho_intel.cam-outfrq9s (Overall: DIFF) details: +SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: +SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details: +SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details: +SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem (Overall: DIFF) details: +SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp (Overall: DIFF) details: + - Diffs due to updated CTSM external + SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL) SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) - pre-existing failures due to build-namelist error requiring CLM/CTSM external update. @@ -54,18 +117,23 @@ SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856 derecho/nvhpc/aux_cam: +ERS_Ln9.ne30pg3_ne30pg3_mg17.F2000dev.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: DIFF) details: + - Diffs due to updated CTSM external -izumi/nag/aux_cam: +izumi/nag/aux_cam: !!due to izumi being down and the desire to make a CESM alpha +tag, the izumi tests were not run!! this changelog entry will be updated once +the tests are run -DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) - - pre-existing failure -- issue #670 - -izumi/gnu/aux_cam: +izumi/gnu/aux_cam: !!due to izumi being down and the desire to make a CESM alpha +tag, the izumi tests were not run!! this changelog entry will be updated once +the tests are run CAM tag used for the baseline comparison tests if different than previous tag: -Summarize any changes to answers: +Summarize any changes to answers: answer changes thanks to updated CTSM tag +- ran derecho intel & nvhpc tests on head of cam_development with ctsm5.3.015 vs baselines for +this tag and confirmed that there were no DIFFs ===============================================================