Merge branch 'worleyph/cime/e3sm_no_recur' (PR #2266)

The checkpoint timing files, in timing/checkpoints, are named cesm_timing_<simulation_date_and_time>. Replace the cesm_timing prefix with model_timing prefix. Also eliminate the (unnecessary) recursive timer call to CPL:RUN when do_budgets is .TRUE. Fixes #2264 Fixes #1981 [BFB]
E3SM-Project · Apr 13, 2018 · 22c28cf · 22c28cf
2 parents 538b361 + 7a970aa
commit 22c28cf
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/driver-mct/main/cime_comp_mod.F90 b/driver-mct/main/cime_comp_mod.F90
@@ -2365,11 +2365,11 @@ subroutine cime_run()
 
           if (do_budgets) then
              call cime_comp_barriers(mpicom=mpicom_CPLID, timer='CPL:BUDGET0_BARRIER')
-             call t_drvstartf ('CPL:BUDGET0',cplrun=.true.,budget=.true.,barrier=mpicom_CPLID)
+             call t_drvstartf ('CPL:BUDGET0',budget=.true.,barrier=mpicom_CPLID)
              xao_ox => prep_aoflux_get_xao_ox() ! array over all instances
              call seq_diag_ocn_mct(ocn(ens1), xao_ox(1), fractions_ox(ens1), infodata, &
                   do_o2x=.true., do_x2o=.true., do_xao=.true.)
-             call t_drvstopf ('CPL:BUDGET0',cplrun=.true.,budget=.true.)
+             call t_drvstopf ('CPL:BUDGET0',budget=.true.)
           endif
 
           if (drv_threading) call seq_comm_setnthreads(nthreads_GLOID)
@@ -2863,11 +2863,11 @@ subroutine cime_run()
 
           if (do_budgets) then
              call cime_comp_barriers(mpicom=mpicom_CPLID, timer='CPL:BUDGET0_BARRIER')
-             call t_drvstartf ('CPL:BUDGET0',cplrun=.true.,budget=.true.,barrier=mpicom_CPLID)
+             call t_drvstartf ('CPL:BUDGET0',budget=.true.,barrier=mpicom_CPLID)
              xao_ox => prep_aoflux_get_xao_ox() ! array over all instances
              call seq_diag_ocn_mct(ocn(ens1), xao_ox(1), fractions_ox(ens1), infodata, &
                   do_o2x=.true., do_x2o=.true., do_xao=.true.)
-             call t_drvstopf ('CPL:BUDGET0',cplrun=.true.,budget=.true.)
+             call t_drvstopf ('CPL:BUDGET0',budget=.true.)
           endif
 
           if (drv_threading) call seq_comm_setnthreads(nthreads_GLOID)
@@ -3220,11 +3220,11 @@ subroutine cime_run()
 
           if (do_budgets) then
              call cime_comp_barriers(mpicom=mpicom_CPLID, timer='CPL:BUDGET0_BARRIER')
-             call t_drvstartf ('CPL:BUDGET0',cplrun=.true.,budget=.true.,barrier=mpicom_CPLID)
+             call t_drvstartf ('CPL:BUDGET0',budget=.true.,barrier=mpicom_CPLID)
              xao_ox => prep_aoflux_get_xao_ox() ! array over all instances
              call seq_diag_ocn_mct(ocn(ens1), xao_ox(1), fractions_ox(ens1), infodata, &
                   do_o2x=.true., do_x2o=.true., do_xao=.true.)
-             call t_drvstopf ('CPL:BUDGET0',cplrun=.true.,budget=.true.)
+             call t_drvstopf ('CPL:BUDGET0',budget=.true.)
           endif
 
           if (drv_threading) call seq_comm_setnthreads(nthreads_GLOID)
@@ -3879,7 +3879,7 @@ subroutine cime_run()
           call t_stopf("CPL:sync1_tprof")
 
           write(timing_file,'(a,i8.8,a1,i5.5)') &
-               trim(tchkpt_dir)//"/cesm_timing"//trim(cpl_inst_tag)//"_",ymd,"_",tod
+               trim(tchkpt_dir)//"/model_timing"//trim(cpl_inst_tag)//"_",ymd,"_",tod
 
           call t_set_prefixf("CPL:")
           if (output_perf) then