From 9d146747f00010ebf0a5985321f3d3662cbb4d61 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 17 Jun 2019 11:19:39 -0600 Subject: [PATCH 1/2] changes needed for mom6 validationn --- driver-mct/main/cime_comp_mod.F90 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/driver-mct/main/cime_comp_mod.F90 b/driver-mct/main/cime_comp_mod.F90 index 20cdf67d1a1d..3cd267a38d39 100644 --- a/driver-mct/main/cime_comp_mod.F90 +++ b/driver-mct/main/cime_comp_mod.F90 @@ -1639,11 +1639,7 @@ subroutine cime_init() ! set skip_ocean_run flag, used primarily for ocn run on first timestep ! use reading a restart as a surrogate from whether this is a startup run -#ifdef COMPARE_TO_NUOPC - skip_ocean_run = .false. -#else skip_ocean_run = .true. -#endif if ( read_restart) skip_ocean_run = .false. ocnrun_count = 0 cpl2ocn_first = .true. @@ -3872,12 +3868,24 @@ subroutine cime_run_atmocn_setup(hashint) ! ocn prep-merge (cesm1_mod or cesm1_mod_tight) if (ocn_prognostic) then +#if COMPARE_TO_NUOPC + !This is need to compare to nuopc + if (.not. skip_ocean_run) then + ! ocn prep-merge + xao_ox => prep_aoflux_get_xao_ox() + call prep_ocn_mrg(infodata, fractions_ox, xao_ox=xao_ox, timer_mrg='CPL:atmocnp_mrgx2o') + + ! Accumulate ocn inputs - form partial sum of tavg ocn inputs (virtual "send" to ocn) + call prep_ocn_accum(timer='CPL:atmocnp_accum') + end if +#else ! ocn prep-merge xao_ox => prep_aoflux_get_xao_ox() call prep_ocn_mrg(infodata, fractions_ox, xao_ox=xao_ox, timer_mrg='CPL:atmocnp_mrgx2o') ! Accumulate ocn inputs - form partial sum of tavg ocn inputs (virtual "send" to ocn) call prep_ocn_accum(timer='CPL:atmocnp_accum') +#endif end if !---------------------------------------------------------- @@ -4471,6 +4479,10 @@ subroutine cime_run_write_history() if (iamin_CPLID) then + !DEBUG + history_alarm = .true. + !DEBUG + call cime_comp_barriers(mpicom=mpicom_CPLID, timer='CPL:HISTORY_BARRIER') call t_drvstartf ('CPL:HISTORY',cplrun=.true.,barrier=mpicom_CPLID) if ( history_alarm) then From 3caa58dcb728dae14caf2ee5adecf8b07d34019a Mon Sep 17 00:00:00 2001 From: mvertens Date: Fri, 5 Jul 2019 16:28:22 -0600 Subject: [PATCH 2/2] removed history alarm to be on at every timestep --- driver-mct/main/cime_comp_mod.F90 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/driver-mct/main/cime_comp_mod.F90 b/driver-mct/main/cime_comp_mod.F90 index 3cd267a38d39..b07946bb0c3f 100644 --- a/driver-mct/main/cime_comp_mod.F90 +++ b/driver-mct/main/cime_comp_mod.F90 @@ -4479,10 +4479,6 @@ subroutine cime_run_write_history() if (iamin_CPLID) then - !DEBUG - history_alarm = .true. - !DEBUG - call cime_comp_barriers(mpicom=mpicom_CPLID, timer='CPL:HISTORY_BARRIER') call t_drvstartf ('CPL:HISTORY',cplrun=.true.,barrier=mpicom_CPLID) if ( history_alarm) then