From 272233afa871cd760d6ed5ca1f51b301b204374b Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Wed, 23 Sep 2020 11:29:07 +0000 Subject: [PATCH 1/3] Modify the halo extents of u and vt in the regional_boundary_update call that caused a reproducibility issue. --- model/fv_regional_bc.F90 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/model/fv_regional_bc.F90 b/model/fv_regional_bc.F90 index 98285b7a3a..e3b6332564 100644 --- a/model/fv_regional_bc.F90 +++ b/model/fv_regional_bc.F90 @@ -4409,6 +4409,12 @@ subroutine regional_boundary_update(array & j1=jsd j2=jed ! +! CHJ --- s --- + if(trim(bc_vbl_name)=='vc'.or.trim(bc_vbl_name)=='u')then + j2=jed+1 + endif +! CHJ --- e --- + i1=isd i2=is-1 ! @@ -4453,7 +4459,13 @@ subroutine regional_boundary_update(array & ! j1=jsd j2=jed -! + +! CHJ --- s --- + if(trim(bc_vbl_name)=='vc'.or.trim(bc_vbl_name)=='u')then + j2=jed+1 + endif +! CHJ --- e --- + i1=ie+1 i2=ied if(trim(bc_vbl_name)=='uc'.or.trim(bc_vbl_name)=='v')then From 6f3d2034bacaadd4967feaf527b2884354290ce6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 7 Oct 2020 08:51:57 -0600 Subject: [PATCH 2/3] model/fv_dynamics.F90: bugfix when debugging output is enabled --- model/fv_dynamics.F90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/model/fv_dynamics.F90 b/model/fv_dynamics.F90 index 16c0e57534..1b706681b7 100644 --- a/model/fv_dynamics.F90 +++ b/model/fv_dynamics.F90 @@ -774,12 +774,12 @@ subroutine fv_dynamics(npx, npy, npz, nq_tot, ng, bdt, consv_te, fill, if ( flagstruct%fv_debug ) then if (is_master()) write(*,'(A, I3, A1, I3)') 'finished k_split ', n_map, '/', k_split call prt_mxm('T_dyn_a3', pt, is, ie, js, je, ng, npz, 1., gridstruct%area_64, domain) - call prt_mxm('SPHUM_dyn', q(isd,jsd,1,sphum ), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) - call prt_mxm('liq_wat_dyn', q(isd,jsd,1,liq_wat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) - call prt_mxm('rainwat_dyn', q(isd,jsd,1,rainwat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) - call prt_mxm('ice_wat_dyn', q(isd,jsd,1,ice_wat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) - call prt_mxm('snowwat_dyn', q(isd,jsd,1,snowwat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) - call prt_mxm('graupel_dyn', q(isd,jsd,1,graupel), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (sphum > 0) call prt_mxm('SPHUM_dyn', q(isd,jsd,1,sphum ), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (liq_wat > 0) call prt_mxm('liq_wat_dyn', q(isd,jsd,1,liq_wat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (rainwat > 0) call prt_mxm('rainwat_dyn', q(isd,jsd,1,rainwat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (ice_wat > 0) call prt_mxm('ice_wat_dyn', q(isd,jsd,1,ice_wat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (snowwat > 0) call prt_mxm('snowwat_dyn', q(isd,jsd,1,snowwat), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) + if (graupel > 0) call prt_mxm('graupel_dyn', q(isd,jsd,1,graupel), is, ie, js, je, ng, npz, 1.,gridstruct%area_64, domain) endif #ifdef AVEC_TIMERS call avec_timer_stop(6) From c3b564f163ff97b2911735c8686dba7f1606f086 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 10 Oct 2020 15:05:46 -0600 Subject: [PATCH 3/3] Comment out test for ntrac > ntracers in tools/external_ic.F90 --- tools/external_ic.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/external_ic.F90 b/tools/external_ic.F90 index 432703501a..44f76c22e7 100644 --- a/tools/external_ic.F90 +++ b/tools/external_ic.F90 @@ -570,8 +570,10 @@ subroutine get_nggps_ic (Atm, fv_domain, dt_atmos ) !--- read in the number of tracers in the NCEP NGGPS ICs call read_data ('INPUT/'//trim(fn_gfs_ctl), 'ntrac', ntrac, no_domain=.TRUE.) - if (ntrac > ntracers) call mpp_error(FATAL,'==> External_ic::get_nggps_ic: more NGGPS tracers & - &than defined in field_table '//trim(fn_gfs_ctl)//' for NGGPS IC') + ! DH* 20200922 - this breaks Ferrier-Aligo MP runs + !if (ntrac > ntracers) call mpp_error(FATAL,'==> External_ic::get_nggps_ic: more NGGPS tracers & + ! &than defined in field_table '//trim(fn_gfs_ctl)//' for NGGPS IC') + ! *DH 20200922 ! call get_data_source(source,Atm%flagstruct%regional)