Skip to content

Commit

Permalink
Merge pull request #1787 from gold2718/PreFix
Browse files Browse the repository at this point in the history
Fix to get PRE test working on ADESP_TEST on Cheyenne
Modified PRE test to look for no pause signal situation.
Modified ADESP_TEST variable change to get output change with new docn aquaplanet.
Added ADESP_TEST to cime_developer suite.

Test suite: scripts_regression_tests.py on Yellowstone, Cheyenne, and Hobart
Test baseline: NA
Test namelist changes: NA
Test status: bit for bit

Fixes #1622

User interface changes?: No

Update gh-pages html (Y/N)?: N

Code review: jedwards
  • Loading branch information
jedwards4b authored Aug 2, 2017
2 parents b65bfd6 + 53aa6e0 commit c4d50cc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion scripts/lib/update_acme_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"DAE.f19_f19.A",
"PET_P32.f19_f19.A",
"SMS.T42_T42.S",
"PRE.f19_f19.ADESP")
"PRE.f19_f19.ADESP",
"PRE.f19_f19.ADESP_TEST")
),

#
Expand Down
9 changes: 8 additions & 1 deletion src/components/data_comps/desp/desp_comp_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,13 @@ subroutine desp_comp_run(EClock, case_name, pause_sig, atm_resume, &

call t_startf('desp_mode')

if (.not. ANY(pause_sig)) then
if ((my_task == master_task) .and. (loglevel > 0)) then
write(logunit, '(2a,i4.4,"-",i2.2,"-",i2.2,"-",i5.5)') subname, &
'WARNING: No pause signals found at',yy,mm,dd,CurrentTOD
end if
end if

! Find the active components and their restart files
! Note hard-coded variable names are just for testing. This could be
! changed if this feature comes to regular use
Expand Down Expand Up @@ -472,7 +479,7 @@ subroutine desp_comp_run(EClock, case_name, pause_sig, atm_resume, &
call get_restart_filenames(ind, cpl_resume, errcode)
allocate(rfilenames(1))
rfilenames(1) = cpl_resume
varname = 'x2oacc_ox_Sa_pslv'
varname = 'x2oacc_ox_Foxx_swnet'
case default
call shr_sys_abort(subname//'Unrecognized ind')
end select
Expand Down

0 comments on commit c4d50cc

Please sign in to comment.