Skip to content

Commit

Permalink
Repl. bounds_clump with bounds_proc in call mml_main; rm FHist testmods
Browse files Browse the repository at this point in the history
The former resolves ESCOMP#42; the latter resolves ESCOMP#43.
Cheyenne test-suite PASS. Generating new baselines since tests that
were failing are now passing.

Next I will run the izumi test-suite and prepare to merge/tag.
  • Loading branch information
slevis-lmwg committed Jan 24, 2023
1 parent 3624bbc commit df5d75b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
8 changes: 4 additions & 4 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<option name="comment">smoke test with SOM for CAM6 for global uniform</option>
</options>
</test>
<test name="SMS" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble_FHist">
<test name="SMS" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_slim"/>
</machines>
Expand All @@ -71,7 +71,7 @@
<option name="comment">smoke test with DOCN for realistic 2000</option>
</options>
</test>
<test name="SMS_Lm3" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble_FHistMonthly">
<test name="SMS_Lm3" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensembleMonthly">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_slim"/>
</machines>
Expand All @@ -80,7 +80,7 @@
<option name="comment">Longer smoke test with DOCN for realistic 2000</option>
</options>
</test>
<test name="PEM" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble_FHist">
<test name="PEM" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_slim"/>
</machines>
Expand All @@ -89,7 +89,7 @@
<option name="comment">change Processors test with DOCN for realistic 2000</option>
</options>
</test>
<test name="ERS_Ld60" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensemble_FHistMonthly">
<test name="ERS_Ld60" grid="f19_g16" compset="F2000Cam6SlimRsGs" testmods="clm/2000_CMIP6_AMIP_1deg_ensembleMonthly">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_slim"/>
</machines>
Expand Down

This file was deleted.

13 changes: 3 additions & 10 deletions src/main/clm_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
integer :: nclumps ! number of clumps on this processor
character(len=256) :: filer ! restart file name
integer :: ier ! error code
type(bounds_type) :: bounds_clump
type(bounds_type) :: bounds_proc

! COMPILER_BUG(wjs, 2014-11-29, pgi 14.7) Workaround for internal compiler error with
Expand All @@ -90,12 +89,6 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
call get_proc_bounds(bounds_proc)
nclumps = get_proc_clumps()

!$OMP PARALLEL DO PRIVATE (nc,bounds_clump)
do nc = 1,nclumps
call get_clump_bounds(nc, bounds_clump)
end do
!$OMP END PARALLEL DO

! ============================================================================
! MML: Simple Land Model Override
! ============================================================================
Expand All @@ -109,9 +102,9 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
! I give it everything it needs. I think lnd2atm (but check!) actually hands the data
! off to the coupler, so if thats the case I need to make my changes before hand.

call t_startf('mml_main')
call mml_main(bounds_clump, atm2lnd_inst, lnd2atm_inst)
call t_stopf('mml_main')
call t_startf('mml_main')
call mml_main(bounds_proc, atm2lnd_inst, lnd2atm_inst)
call t_stopf('mml_main')

!write(iulog,*) 'MML: done with simple model, back at clm_driver'

Expand Down

0 comments on commit df5d75b

Please sign in to comment.