diff --git a/fv3_cap.F90 b/fv3_cap.F90 index efd84211f..ada73a861 100644 --- a/fv3_cap.F90 +++ b/fv3_cap.F90 @@ -288,7 +288,7 @@ subroutine InitializeAdvertise(gcomp, rc) if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return call ESMF_ConfigGetAttribute(config=CF,value=quilting_restart, & - default=.false., label ='quilting_restart:',rc=rc) + default=.true., label ='quilting_restart:',rc=rc) if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return if (.not.quilting) quilting_restart = .false. diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 2026b67d9..97962bdd9 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -551,7 +551,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) dustpm10, dustcb, bccb, occb, sulfcb, sscb, & dustallcb, ssallcb, dustpm, sspm, pp25cb, pp10cb, & no3cb, nh4cb, dusmass, ducmass, dusmass25,ducmass25, & - snownc, graupelnc, qrmax + snownc, graupelnc, qrmax, hail_maxhailcast use soil, only: sldpth, sh2o, smc, stc, sllevel use masks, only: lmv, lmh, htm, vtm, gdlat, gdlon, dx, dy, hbm2, sm, sice use ctlblk_mod, only: im, jm, lm, lp1, jsta, jend, jsta_2l, jend_2u, jsta_m,jend_m, & @@ -995,6 +995,17 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif + ! Maximum hail diameter (mm) since last output + if(trim(fieldname)=='hailcast_dhail') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,hail_maxhailcast,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + hail_maxhailcast(i,j)=arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillValue) < small) hail_maxhailcast(i,j)=spval + enddo + enddo + endif + ! biomass burning emissions if(trim(fieldname)=='ebb_smoke_hr') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,ebb,arrayr42d,fillValue,spval) diff --git a/upp b/upp index fae617ba4..78f369b01 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit fae617ba485dbbadc8fc10f512a6a0c29c81741a +Subproject commit 78f369b011ec41dca87a1260298d0228f2c4f38f