From 34923f0e71c55562254067936a1856349805e717 Mon Sep 17 00:00:00 2001 From: Dan Rosen Date: Thu, 13 Apr 2023 15:17:05 -0600 Subject: [PATCH 01/11] Update atmos_model export fields * added: inst_pres_levels (statein%prsl) * added: inst_geop_levels (statein%phil) * added: inst_zonal_wind_levels (statein%ugrs) * added: inst_merid_wind_levels (statein%vgrs) * added: inst_surface_roughness (sfcprop%zorl) * updated: inst_temp_height2m (sfcprop%t2m) * updated: inst_spec_humid_height2m (sfcprop%q2m) * updated: inst_pres_height_surface (statein%pgr) * updated: mean_prec_rate (sfcprop%tprcp / rtimek) --- atmos_model.F90 | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index e6bbb72c7..e0b8c7026 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2906,6 +2906,21 @@ subroutine setup_exportdata(rc) do nb = 1, Atm_block%nblks select case (trim(fieldname)) !--- Instantaneous quantities + ! Instantaneous mean layer pressure (Pa) + case ('inst_pres_levels') + call block_data_copy_or_fill(datar83d, GFS_data(nb)%Statein%prsl, zeror8, Atm_block, nb, rc=localrc) + ! Instantaneous geopotential at model layer centers (m2 s-2) + case ('inst_geop_levels') + call block_data_copy_or_fill(datar83d, GFS_data(nb)%Statein%phil, zeror8, Atm_block, nb, rc=localrc) + ! Instantaneous zonal wind (m s-1) + case ('inst_zonal_wind_levels') + call block_data_copy_or_fill(datar83d, GFS_data(nb)%Statein%ugrs, zeror8, Atm_block, nb, rc=localrc) + ! Instantaneous meridional wind (m s-1) + case ('inst_merid_wind_levels') + call block_data_copy_or_fill(datar83d, GFS_data(nb)%Statein%vgrs, zeror8, Atm_block, nb, rc=localrc) + ! Instantaneous surface roughness length (cm) + case ('inst_surface_roughness') + call block_data_copy(datar82d, GFS_data(nb)%sfcprop%zorl, Atm_block, nb, rc=localrc) ! Instantaneous u wind (m/s) 10 m above ground case ('inst_zonal_wind_height10m') call block_data_copy(datar82d, GFS_data(nb)%coupling%u10mi_cpl, Atm_block, nb, rc=localrc) @@ -2932,16 +2947,16 @@ subroutine setup_exportdata(rc) call block_data_copy(datar82d, GFS_data(nb)%coupling%dswsfci_cpl, Atm_block, nb, rc=localrc) ! Instantaneous Temperature (K) 2 m above ground case ('inst_temp_height2m') - call block_data_copy(datar82d, GFS_data(nb)%coupling%t2mi_cpl, Atm_block, nb, rc=localrc) + call block_data_copy(datar82d, GFS_data(nb)%sfcprop%t2m, Atm_block, nb, rc=localrc) ! Instantaneous Specific humidity (kg/kg) 2 m above ground case ('inst_spec_humid_height2m') - call block_data_copy(datar82d, GFS_data(nb)%coupling%q2mi_cpl, Atm_block, nb, rc=localrc) + call block_data_copy(datar82d, GFS_data(nb)%sfcprop%q2m, Atm_block, nb, rc=localrc) ! Instantaneous Temperature (K) at surface case ('inst_temp_height_surface') call block_data_copy(datar82d, GFS_data(nb)%coupling%tsfci_cpl, Atm_block, nb, rc=localrc) ! Instantaneous Pressure (Pa) land and sea surface case ('inst_pres_height_surface') - call block_data_copy(datar82d, GFS_data(nb)%coupling%psurfi_cpl, Atm_block, nb, rc=localrc) + call block_data_copy(datar82d, GFS_data(nb)%Statein%pgr, Atm_block, nb, rc=localrc) ! Instantaneous Surface height (m) case ('inst_surface_height') call block_data_copy(datar82d, GFS_data(nb)%coupling%oro_cpl, Atm_block, nb, rc=localrc) @@ -3029,7 +3044,7 @@ subroutine setup_exportdata(rc) call block_data_copy(datar82d, GFS_data(nb)%coupling%nvisdf_cpl, Atm_block, nb, scale_factor=rtime, rc=localrc) ! MEAN precipitation rate (kg/m2/s) case ('mean_prec_rate') - call block_data_copy(datar82d, GFS_data(nb)%coupling%rain_cpl, Atm_block, nb, scale_factor=rtimek, rc=localrc) + call block_data_copy(datar82d, GFS_data(nb)%sfcprop%tprcp, Atm_block, nb, scale_factor=rtimek, rc=localrc) ! MEAN convective precipitation rate (kg/m2/s) case ('mean_prec_rate_conv') call block_data_copy(datar82d, GFS_Data(nb)%Coupling%rainc_cpl, Atm_block, nb, scale_factor=rtimek, rc=localrc) From fd7178dd2a19d4a255b432d80bfe00b458ddd857 Mon Sep 17 00:00:00 2001 From: Dan Rosen Date: Fri, 14 Jul 2023 11:23:03 -0600 Subject: [PATCH 02/11] Update atmos_model export fields * added: inst_rainfall_amount (sfcprop%tprcp) --- atmos_model.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/atmos_model.F90 b/atmos_model.F90 index e0b8c7026..e7c12a513 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2993,6 +2993,9 @@ subroutine setup_exportdata(rc) ! Land/Sea mask (sea:0,land:1) case ('inst_land_sea_mask', 'slmsk') call block_data_copy(datar82d, GFS_data(nb)%sfcprop%slmsk, Atm_block, nb, rc=localrc) + ! Total precipitation amount in each time step + case ('inst_rainfall_amount') + call block_data_copy(datar82d, GFS_data(nb)%sfcprop%tprcp, Atm_block, nb, rc=localrc) !--- Mean quantities ! MEAN Zonal compt of momentum flux (N/m**2) case ('mean_zonal_moment_flx_atm') From 8fea4784f7d98967340ac1a2c626fac73eeccf88 Mon Sep 17 00:00:00 2001 From: Dan Rosen Date: Fri, 22 Sep 2023 16:11:39 -0600 Subject: [PATCH 03/11] Update ccpp/physics to development fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..43adc1346 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics + url = https://github.com/esmf-org/ccpp-physics branch = ufs/dev [submodule "upp"] path = upp From 9b9133806e619a4814a492a3f964ea1b8cba249c Mon Sep 17 00:00:00 2001 From: masih Date: Wed, 18 Oct 2023 15:31:03 -0600 Subject: [PATCH 04/11] add fire behavior tendencies to physics * add hflx_fire and evap_fire to FV3 imports * add cpl_fire flag and variable initialization * update ccpp/physics --- atmos_model.F90 | 31 +++++++++++++++++++++++++++++++ ccpp/data/GFS_typedefs.F90 | 18 +++++++++++++++++- ccpp/data/GFS_typedefs.meta | 22 ++++++++++++++++++++++ ccpp/physics | 2 +- cpl/module_cplfields.F90 | 6 ++++-- 5 files changed, 75 insertions(+), 4 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index 71ce45cb7..523f31d1d 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2730,6 +2730,37 @@ subroutine assign_importdata(jdat, rc) endif endif + fldname = 'hflx_fire' + if (trim(impfield_name) == trim(fldname)) then + findex = queryImportFields(fldname) + if (importFieldsValid(findex)) then +!$omp parallel do default(shared) private(i,j,nb,ix) + do j=jsc,jec + do i=isc,iec + nb = Atm_block%blkno(i,j) + ix = Atm_block%ixp(i,j) + GFS_data(nb)%Sfcprop%hflx_fire(ix) = datar82d(i-isc+1,j-jsc+1) + enddo + enddo + endif + endif + + fldname = 'evap_fire' + if (trim(impfield_name) == trim(fldname)) then + findex = queryImportFields(fldname) + if (importFieldsValid(findex)) then +!$omp parallel do default(shared) private(i,j,nb,ix) + do j=jsc,jec + do i=isc,iec + nb = Atm_block%blkno(i,j) + ix = Atm_block%ixp(i,j) + GFS_data(nb)%Sfcprop%evap_fire(ix) = datar82d(i-isc+1,j-jsc+1) + enddo + enddo + endif + endif + + ! write post merge import data to NetCDF file. if (GFS_control%cpl_imp_dbg) then call ESMF_FieldGet(importFields(n), grid=grid, rc=rc) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 80826ba42..65c93d7af 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -294,6 +294,10 @@ module GFS_typedefs real (kind=kind_phys), pointer :: hflx (:) => null() !< real (kind=kind_phys), pointer :: qss (:) => null() !< +!--- fire_behavior + real (kind=kind_phys), pointer :: hflx_fire (:) => null() !< kinematic surface upward sensible heat flux of fire + real (kind=kind_phys), pointer :: evap_fire (:) => null() !< kinematic surface upward latent heat flux of fire + !-- In/Out real (kind=kind_phys), pointer :: maxupmf(:) => null() !< maximum up draft mass flux for Grell-Freitas real (kind=kind_phys), pointer :: conv_act(:) => null() !< convective activity counter for Grell-Freitas @@ -739,6 +743,7 @@ module GFS_typedefs logical :: cplchm !< default no cplchm collection logical :: cpllnd !< default no cpllnd collection logical :: rrfs_sd !< default no rrfs_sd collection + logical :: cpl_fire !< default no fire_behavior collection logical :: use_cice_alb !< default .false. - i.e. don't use albedo imported from the ice model logical :: cpl_imp_mrg !< default no merge import with internal forcings logical :: cpl_imp_dbg !< default no write import data to file post merge @@ -2798,6 +2803,14 @@ subroutine sfcprop_create (Sfcprop, IM, Model) Sfcprop%fire_in = clear_val endif + !--- if fire_behavior is on + if(Model%cpl_fire) then + allocate (Sfcprop%hflx_fire (IM)) + allocate (Sfcprop%evap_fire (IM)) + Sfcprop%hflx_fire = zero + Sfcprop%evap_fire = zero + endif + end subroutine sfcprop_create @@ -3250,6 +3263,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: cplchm = .false. !< default no cplchm collection logical :: cpllnd = .false. !< default no cpllnd collection logical :: rrfs_sd = .false. !< default no rrfs_sd collection + logical :: cpl_fire = .false. !< default no fire behavior colleciton logical :: use_cice_alb = .false. !< default no cice albedo logical :: cpl_imp_mrg = .false. !< default no merge import with internal forcings logical :: cpl_imp_dbg = .false. !< default no write import data to file post merge @@ -3861,7 +3875,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & thermodyn_id, sfcpress_id, & !--- coupling parameters cplflx, cplice, cplocn2atm, cplwav, cplwav2atm, cplaqm, & - cplchm, cpllnd, cpl_imp_mrg, cpl_imp_dbg, rrfs_sd, & + cplchm, cpllnd, cpl_imp_mrg, cpl_imp_dbg, cpl_fire, rrfs_sd, & use_cice_alb, & #ifdef IDEA_PHYS lsidea, weimer_model, f107_kp_size, f107_kp_interval, & @@ -4207,6 +4221,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !--- RRFS-SD Model%rrfs_sd = rrfs_sd + Model%cpl_fire = cpl_fire Model%dust_alpha = dust_alpha Model%dust_gamma = dust_gamma Model%wetdep_ls_alpha = wetdep_ls_alpha @@ -6294,6 +6309,7 @@ subroutine control_print(Model) print *, ' cplchm : ', Model%cplchm print *, ' cpllnd : ', Model%cpllnd print *, ' rrfs_sd : ', Model%rrfs_sd + print *, ' cpl_fire : ', Model%cpl_fire print *, ' use_cice_alb : ', Model%use_cice_alb print *, ' cpl_imp_mrg : ', Model%cpl_imp_mrg print *, ' cpl_imp_dbg : ', Model%cpl_imp_dbg diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 9b54e5c2c..b6eb2a91e 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -2318,6 +2318,22 @@ type = real kind = kind_phys active = (do_smoke_coupling) +[hflx_fire] + standard_name = kinematic_surface_upward_sensible_heat_flux_of_fire + long_name = kinematic surface upward sensible heat flux of fire + units = K m s-1 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (do_fire_coupling) +[evap_fire] + standard_name = surface_upward_specific_humidity_flux_of_fire + long_name = kinematic surface upward latent heat flux of fire + units = kg kg-1 m s-1 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (do_fire_coupling) ######################################################################## [ccpp-table-properties] @@ -3394,6 +3410,12 @@ units = flag dimensions = () type = logical +[cpl_fire] + standard_name = do_fire_coupling + long_name = flag controlling fire_behavior collection (default off) + units = flag + dimensions = () + type = logical [cpl_imp_mrg] standard_name = flag_for_merging_imported_data long_name = flag controlling cpl_imp_mrg for imported data (default off) diff --git a/ccpp/physics b/ccpp/physics index 5b946850a..67e550497 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5b946850af58e1cea8c37661158b661df21e9390 +Subproject commit 67e550497db6c50525140307358b5d2a48c47552 diff --git a/cpl/module_cplfields.F90 b/cpl/module_cplfields.F90 index 884a3bdeb..19b6227c0 100644 --- a/cpl/module_cplfields.F90 +++ b/cpl/module_cplfields.F90 @@ -158,7 +158,7 @@ module module_cplfields FieldInfo("t2m ", "s") ] ! Import Fields ---------------------------------------- - integer, public, parameter :: NimportFields = 48 + integer, public, parameter :: NimportFields = 50 logical, public :: importFieldsValid(NimportFields) type(ESMF_Field), target, public :: importFields(NimportFields) @@ -216,7 +216,9 @@ module module_cplfields FieldInfo("snwdph ", "s"), & FieldInfo("f10m ", "s"), & FieldInfo("zorl ", "s"), & - FieldInfo("t2m ", "s") ] + FieldInfo("t2m ", "s"), & + FieldInfo("hflx_fire ", "s"), & + FieldInfo("evap_fire ", "s") ] ! Fields exported exclusively for coupling with chemistry character(*), public, parameter :: chemistryFieldNames(*) = [ & From 0105f66bf57c5601c651b701c0f0451d30d8e406 Mon Sep 17 00:00:00 2001 From: masih Date: Tue, 2 Jan 2024 15:35:48 -0700 Subject: [PATCH 05/11] fire_behavior smoke coupling * added surface emissions fire_smoke imports * initialized the variables and fsmoke tracer index --- atmos_model.F90 | 14 ++++++++++++++ ccpp/data/GFS_typedefs.F90 | 9 ++++++++- ccpp/data/GFS_typedefs.meta | 14 ++++++++++++++ ccpp/physics | 2 +- cpl/module_cplfields.F90 | 5 +++-- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index 523f31d1d..8a2d8ef8f 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -2760,6 +2760,20 @@ subroutine assign_importdata(jdat, rc) endif endif + fldname = 'smoke_fire' + if (trim(impfield_name) == trim(fldname)) then + findex = queryImportFields(fldname) + if (importFieldsValid(findex)) then +!$omp parallel do default(shared) private(i,j,nb,ix) + do j=jsc,jec + do i=isc,iec + nb = Atm_block%blkno(i,j) + ix = Atm_block%ixp(i,j) + GFS_data(nb)%Sfcprop%smoke_fire(ix) = datar82d(i-isc+1,j-jsc+1) + enddo + enddo + endif + endif ! write post merge import data to NetCDF file. if (GFS_control%cpl_imp_dbg) then diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 65c93d7af..9bf5cd64f 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -297,6 +297,7 @@ module GFS_typedefs !--- fire_behavior real (kind=kind_phys), pointer :: hflx_fire (:) => null() !< kinematic surface upward sensible heat flux of fire real (kind=kind_phys), pointer :: evap_fire (:) => null() !< kinematic surface upward latent heat flux of fire + real (kind=kind_phys), pointer :: smoke_fire (:) => null() !< smoke emission of fire !-- In/Out real (kind=kind_phys), pointer :: maxupmf(:) => null() !< maximum up draft mass flux for Grell-Freitas @@ -1444,6 +1445,7 @@ module GFS_typedefs integer :: nto2 !< tracer index for oxygen integer :: ntwa !< tracer index for water friendly aerosol integer :: ntia !< tracer index for ice friendly aerosol + integer :: ntfsmoke !< tracer index for fire smoke integer :: ntsmoke !< tracer index for smoke integer :: ntdust !< tracer index for dust integer :: ntcoarsepm !< tracer index for coarse PM @@ -2807,8 +2809,10 @@ subroutine sfcprop_create (Sfcprop, IM, Model) if(Model%cpl_fire) then allocate (Sfcprop%hflx_fire (IM)) allocate (Sfcprop%evap_fire (IM)) + allocate (Sfcprop%smoke_fire (IM)) Sfcprop%hflx_fire = zero Sfcprop%evap_fire = zero + Sfcprop%smoke_fire = zero endif end subroutine sfcprop_create @@ -5021,12 +5025,14 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%nqrimef = get_tracer_index(Model%tracer_names, 'q_rimef', Model%me, Model%master, Model%debug) Model%ntwa = get_tracer_index(Model%tracer_names, 'liq_aero', Model%me, Model%master, Model%debug) Model%ntia = get_tracer_index(Model%tracer_names, 'ice_aero', Model%me, Model%master, Model%debug) + if (Model%cpl_fire) then + Model%ntfsmoke = get_tracer_index(Model%tracer_names, 'fsmoke', Model%me, Model%master, Model%debug) + endif if (Model%rrfs_sd) then Model%ntsmoke = get_tracer_index(Model%tracer_names, 'smoke', Model%me, Model%master, Model%debug) Model%ntdust = get_tracer_index(Model%tracer_names, 'dust', Model%me, Model%master, Model%debug) Model%ntcoarsepm = get_tracer_index(Model%tracer_names, 'coarsepm', Model%me, Model%master, Model%debug) endif - !--- initialize parameters for atmospheric chemistry tracers call Model%init_chemistry(tracer_types) @@ -6760,6 +6766,7 @@ subroutine control_print(Model) print *, ' nto2 : ', Model%nto2 print *, ' ntwa : ', Model%ntwa print *, ' ntia : ', Model%ntia + print *, ' ntfsmoke : ', Model%ntfsmoke print *, ' ntsmoke : ', Model%ntsmoke print *, ' ntdust : ', Model%ntdust print *, ' ntcoarsepm : ', Model%ntcoarsepm diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index b6eb2a91e..d56757e2d 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -2334,6 +2334,14 @@ type = real kind = kind_phys active = (do_fire_coupling) +[smoke_fire] + standard_name = smoke_emission_of_fire + long_name = smoke emission of fire + units = kg m-2 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (do_fire_coupling) ######################################################################## [ccpp-table-properties] @@ -6231,6 +6239,12 @@ units = index dimensions = () type = integer +[ntfsmoke] + standard_name = index_for_fire_smoke_in_tracer_concentration_array + long_name = tracer index for fire smoke + units = index + dimensions = () + type = integer [ntdust] standard_name = index_for_dust_in_tracer_concentration_array long_name = tracer index for dust diff --git a/ccpp/physics b/ccpp/physics index 67e550497..8a0c85c55 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 67e550497db6c50525140307358b5d2a48c47552 +Subproject commit 8a0c85c55aa73f31e720921b3149cdf70798daa1 diff --git a/cpl/module_cplfields.F90 b/cpl/module_cplfields.F90 index 19b6227c0..f6d69668d 100644 --- a/cpl/module_cplfields.F90 +++ b/cpl/module_cplfields.F90 @@ -158,7 +158,7 @@ module module_cplfields FieldInfo("t2m ", "s") ] ! Import Fields ---------------------------------------- - integer, public, parameter :: NimportFields = 50 + integer, public, parameter :: NimportFields = 51 logical, public :: importFieldsValid(NimportFields) type(ESMF_Field), target, public :: importFields(NimportFields) @@ -218,7 +218,8 @@ module module_cplfields FieldInfo("zorl ", "s"), & FieldInfo("t2m ", "s"), & FieldInfo("hflx_fire ", "s"), & - FieldInfo("evap_fire ", "s") ] + FieldInfo("evap_fire ", "s"), & + FieldInfo("smoke_fire ", "s") ] ! Fields exported exclusively for coupling with chemistry character(*), public, parameter :: chemistryFieldNames(*) = [ & From 82903d12098531d8b8ff74b7d65d1b5dcf239bf2 Mon Sep 17 00:00:00 2001 From: masih Date: Mon, 20 May 2024 10:23:10 -0600 Subject: [PATCH 06/11] add flags and export variables for fire behavior --- ccpp/physics | 2 +- cpl/module_cplfields.F90 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ccpp/physics b/ccpp/physics index e399c2285..6a1c0ac27 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e399c228545d2adb8ebf62afa4c6c6a4a0438795 +Subproject commit 6a1c0ac274f10aefcdf8e2aa67227b122a56a6e3 diff --git a/cpl/module_cplfields.F90 b/cpl/module_cplfields.F90 index 2d62b131a..1d07a7cec 100644 --- a/cpl/module_cplfields.F90 +++ b/cpl/module_cplfields.F90 @@ -26,7 +26,7 @@ module module_cplfields ! l : model levels (3D) ! s : surface (2D) ! t : tracers (4D) - integer, public, parameter :: NexportFields = 119 + integer, public, parameter :: NexportFields = 120 type(ESMF_Field), target, public :: exportFields(NexportFields) type(FieldInfo), dimension(NexportFields), public, parameter :: exportFieldsInfo = [ & @@ -64,6 +64,7 @@ module module_cplfields FieldInfo("mean_evap_rate ", "s"), & FieldInfo("mean_down_lw_flx ", "s"), & FieldInfo("mean_down_sw_flx ", "s"), & + FieldInfo("mean_prec_rate ", "s"), & FieldInfo("inst_prec_rate ", "s"), & FieldInfo("inst_zonal_moment_flx ", "s"), & FieldInfo("inst_merid_moment_flx ", "s"), & From cc2a4ca443675aee743a2ffad0252fc7e3cc7bbd Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 21 Aug 2024 12:52:21 -0400 Subject: [PATCH 07/11] update GFS_diagnostics.F90 for blocked data change --- ccpp/driver/GFS_diagnostics.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 93685b098..4729819ea 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4662,7 +4662,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%mod_name = 'gfs_phys' allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks - ExtDiag(idx)%data(nb)%var3 => Statein(nb)%qgrs(:,:,Model%ntfsmoke) + ExtDiag(idx)%data(nb)%var3 => Statein%qgrs(Model%chunk_begin(nb):Model%chunk_end(nb),:,Model%ntfsmoke) enddo endif From c1552db0f474ad7fa468178c623cb5cdbec06ae1 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 21 Aug 2024 15:08:06 -0400 Subject: [PATCH 08/11] fix inadvertent syntax error --- atmos_model.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_model.F90 b/atmos_model.F90 index ab4178c9b..1cd0906ea 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -1,4 +1,4 @@ -< Date: Thu, 22 Aug 2024 13:54:14 -0400 Subject: [PATCH 09/11] update ccpp/physics submodule after updating --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 598db4b0b..ebe335d03 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 598db4b0b05378543b95ce161e8d98e171e3dd00 +Subproject commit ebe335d0364bd9840b230c012ab7903ee709f569 From f96dc867e29b45c87f0d715fb6ea9c1a2eb7cf1b Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 17 Sep 2024 09:55:13 -0400 Subject: [PATCH 10/11] update ccpp-physics submodule pointer and revert .gitmodules after testing --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 75152781f..3927be635 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/esmf-org/ccpp-physics - branch = feature/ufs_fire_cpl + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 5c8eb2f65..b6c433354 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5c8eb2f6590580a6b8b081f4ca66551406494711 +Subproject commit b6c433354394bd8ed5e46692a81149441ff4ae38 From 5186d2c2bbc56a128cd7715029d7f476c3f1b01c Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Tue, 17 Sep 2024 10:10:15 -0400 Subject: [PATCH 11/11] removed whitespace: .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3927be635..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP