Skip to content

Commit

Permalink
Merge pull request #660 from bstephens82/cam_development
Browse files Browse the repository at this point in the history
cam6_3_078: Making nextsw_cday a double type to fix cam_dev restart bug.
  • Loading branch information
cacraigucar authored Sep 28, 2022
2 parents 0764b57 + b148c3d commit caa7353
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 3 deletions.
49 changes: 49 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@

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

Tag name:cam6_3_078
Originator(s): stepheba, cacraig
Date: Sept 28, 2022
One-line Summary: Correct cam_dev restart issue due to nextsw_cday being an integer instead of a double
Github PR URL: https://github.com/ESCOMP/CAM/pull/660

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- cam_dev is unable to achieve bit-for-bit restarts in numerous configurations: https://github.com/ESCOMP/CAM/issues/655

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: jet, fvitt, courtneyp, nusbaume (in PR#659)

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 src/physics/camrt/radiation.F90
M src/physics/rrtmg/radiation.F90
- Make nextsw_cday a double instead of an integer to fix cam_dev restart issue

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

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=10
- preexisting failure

izumi/gnu/aux_cam: all BFB

IMPORTANT NOTE-- This tag is answer changing for restarts which call radiation on the restart time step. None of our tests
were restarting at this time step which is why all the tests are BFB

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

Tag name: cam6_3_077
Expand Down
2 changes: 1 addition & 1 deletion src/physics/camrt/radiation.F90
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ subroutine radiation_define_restart(file)

call pio_seterrorhandling(File, PIO_BCAST_ERROR)

ierr = pio_def_var(File, 'nextsw_cday', pio_int, nextsw_cday_desc)
ierr = pio_def_var(File, 'nextsw_cday', pio_double, nextsw_cday_desc)
ierr = pio_put_att(File, nextsw_cday_desc, 'long_name', 'future radiation calday for surface models')

if (radiation_do('aeres')) then
Expand Down
4 changes: 2 additions & 2 deletions src/physics/rrtmg/radiation.F90
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module radiation
use cam_history_support, only: fillvalue

use pio, only: file_desc_t, var_desc_t, &
pio_int, pio_noerr, &
pio_int, pio_double, pio_noerr, &
pio_seterrorhandling, pio_bcast_error, &
pio_inq_varid, pio_def_var, &
pio_put_var, pio_get_var, pio_put_att
Expand Down Expand Up @@ -647,7 +647,7 @@ subroutine radiation_define_restart(file)

call pio_seterrorhandling(File, PIO_BCAST_ERROR)

ierr = pio_def_var(File, 'nextsw_cday', pio_int, nextsw_cday_desc)
ierr = pio_def_var(File, 'nextsw_cday', pio_double, nextsw_cday_desc)
ierr = pio_put_att(File, nextsw_cday_desc, 'long_name', 'future radiation calday for surface models')
if (docosp) then
ierr = pio_def_var(File, 'cosp_cnt_init', pio_int, cospcnt_desc)
Expand Down

0 comments on commit caa7353

Please sign in to comment.