From f496099a9a55acdea52e23f9c2a6d5b043f5b1df Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 19 May 2022 00:19:54 +0000 Subject: [PATCH 1/2] Fix from Joe to remove code that was added back in by the big merge. --- physics/GFS_rrtmgp_cloud_mp.F90 | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/physics/GFS_rrtmgp_cloud_mp.F90 b/physics/GFS_rrtmgp_cloud_mp.F90 index 53b4d801c..60d5a0a85 100644 --- a/physics/GFS_rrtmgp_cloud_mp.F90 +++ b/physics/GFS_rrtmgp_cloud_mp.F90 @@ -179,20 +179,11 @@ subroutine GFS_rrtmgp_cloud_mp_run(nCol, nLev, nTracers, ncnd, i_cldliq, i_cldic ! ! SGS clouds present, use cloud-fraction modified to include sgs clouds. ! - if ((imfdeepcnv==imfdeepcnv_gf .or. do_mynnedmf) .and. kdt>1) then - ! MYNN sub-grid cloud fraction. - if (do_mynnedmf) then - ! If rain/snow present, use GFDL MP cloud-fraction... - if (tracer(iCol,iLay,i_cldrain)>1.0e-7 .OR. tracer(iCol,iLay,i_cldsnow)>1.0e-7) then - cld_frac(iCol,iLay) = tracer(iCol,iLay,i_cldtot) - endif - ! GF sub-grid cloud fraction. - else - ! If no convective cloud condensate present, use GFDL MP cloud-fraction.... - if (qci_conv(iCol,iLay) <= 0.) then - cld_frac(iCol,iLay) = tracer(iCol,iLay,i_cldtot) - endif - endif + if (imfdeepcnv==imfdeepcnv_gf .and. kdt>1) then + ! If no convective cloud condensate present, use GFDL MP cloud-fraction.... + if (qci_conv(iCol,iLay) <= 0.) then + cld_frac(iCol,iLay) = tracer(iCol,iLay,i_cldtot) + endif ! ! No SGS clouds, use GFDL MP cloud-fraction... ! From 1d2d97038ecf9a0f94f235e552e516183f0cc18e Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 19 May 2022 20:56:48 +0000 Subject: [PATCH 2/2] move smoke to physics/smoke --- {smoke => physics/smoke}/dep_dry_gocart_mod.F90 | 0 {smoke => physics/smoke}/dep_dry_mod.F90 | 0 {smoke => physics/smoke}/dep_simple_mod.F90 | 0 {smoke => physics/smoke}/dep_vertmx_mod.F90 | 0 {smoke => physics/smoke}/dep_wet_ls_mod.F90 | 0 {smoke => physics/smoke}/dust_data_mod.F90 | 0 {smoke => physics/smoke}/dust_fengsha_mod.F90 | 0 {smoke => physics/smoke}/module_add_emiss_burn.F90 | 0 {smoke => physics/smoke}/module_plumerise1.F90 | 0 {smoke => physics/smoke}/module_smoke_plumerise.F90 | 0 {smoke => physics/smoke}/module_zero_plumegen_coms.F90 | 0 {smoke => physics/smoke}/plume_data_mod.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_config.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_data.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_lsdep_wrapper.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_lsdep_wrapper.meta | 0 {smoke => physics/smoke}/rrfs_smoke_postpbl.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_postpbl.meta | 0 {smoke => physics/smoke}/rrfs_smoke_wrapper.F90 | 0 {smoke => physics/smoke}/rrfs_smoke_wrapper.meta | 0 {smoke => physics/smoke}/seas_data_mod.F90 | 0 {smoke => physics/smoke}/seas_mod.F90 | 0 {smoke => physics/smoke}/seas_ngac_mod.F90 | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename {smoke => physics/smoke}/dep_dry_gocart_mod.F90 (100%) rename {smoke => physics/smoke}/dep_dry_mod.F90 (100%) rename {smoke => physics/smoke}/dep_simple_mod.F90 (100%) rename {smoke => physics/smoke}/dep_vertmx_mod.F90 (100%) rename {smoke => physics/smoke}/dep_wet_ls_mod.F90 (100%) rename {smoke => physics/smoke}/dust_data_mod.F90 (100%) rename {smoke => physics/smoke}/dust_fengsha_mod.F90 (100%) rename {smoke => physics/smoke}/module_add_emiss_burn.F90 (100%) rename {smoke => physics/smoke}/module_plumerise1.F90 (100%) rename {smoke => physics/smoke}/module_smoke_plumerise.F90 (100%) rename {smoke => physics/smoke}/module_zero_plumegen_coms.F90 (100%) rename {smoke => physics/smoke}/plume_data_mod.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_config.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_data.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_lsdep_wrapper.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_lsdep_wrapper.meta (100%) rename {smoke => physics/smoke}/rrfs_smoke_postpbl.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_postpbl.meta (100%) rename {smoke => physics/smoke}/rrfs_smoke_wrapper.F90 (100%) rename {smoke => physics/smoke}/rrfs_smoke_wrapper.meta (100%) rename {smoke => physics/smoke}/seas_data_mod.F90 (100%) rename {smoke => physics/smoke}/seas_mod.F90 (100%) rename {smoke => physics/smoke}/seas_ngac_mod.F90 (100%) diff --git a/smoke/dep_dry_gocart_mod.F90 b/physics/smoke/dep_dry_gocart_mod.F90 similarity index 100% rename from smoke/dep_dry_gocart_mod.F90 rename to physics/smoke/dep_dry_gocart_mod.F90 diff --git a/smoke/dep_dry_mod.F90 b/physics/smoke/dep_dry_mod.F90 similarity index 100% rename from smoke/dep_dry_mod.F90 rename to physics/smoke/dep_dry_mod.F90 diff --git a/smoke/dep_simple_mod.F90 b/physics/smoke/dep_simple_mod.F90 similarity index 100% rename from smoke/dep_simple_mod.F90 rename to physics/smoke/dep_simple_mod.F90 diff --git a/smoke/dep_vertmx_mod.F90 b/physics/smoke/dep_vertmx_mod.F90 similarity index 100% rename from smoke/dep_vertmx_mod.F90 rename to physics/smoke/dep_vertmx_mod.F90 diff --git a/smoke/dep_wet_ls_mod.F90 b/physics/smoke/dep_wet_ls_mod.F90 similarity index 100% rename from smoke/dep_wet_ls_mod.F90 rename to physics/smoke/dep_wet_ls_mod.F90 diff --git a/smoke/dust_data_mod.F90 b/physics/smoke/dust_data_mod.F90 similarity index 100% rename from smoke/dust_data_mod.F90 rename to physics/smoke/dust_data_mod.F90 diff --git a/smoke/dust_fengsha_mod.F90 b/physics/smoke/dust_fengsha_mod.F90 similarity index 100% rename from smoke/dust_fengsha_mod.F90 rename to physics/smoke/dust_fengsha_mod.F90 diff --git a/smoke/module_add_emiss_burn.F90 b/physics/smoke/module_add_emiss_burn.F90 similarity index 100% rename from smoke/module_add_emiss_burn.F90 rename to physics/smoke/module_add_emiss_burn.F90 diff --git a/smoke/module_plumerise1.F90 b/physics/smoke/module_plumerise1.F90 similarity index 100% rename from smoke/module_plumerise1.F90 rename to physics/smoke/module_plumerise1.F90 diff --git a/smoke/module_smoke_plumerise.F90 b/physics/smoke/module_smoke_plumerise.F90 similarity index 100% rename from smoke/module_smoke_plumerise.F90 rename to physics/smoke/module_smoke_plumerise.F90 diff --git a/smoke/module_zero_plumegen_coms.F90 b/physics/smoke/module_zero_plumegen_coms.F90 similarity index 100% rename from smoke/module_zero_plumegen_coms.F90 rename to physics/smoke/module_zero_plumegen_coms.F90 diff --git a/smoke/plume_data_mod.F90 b/physics/smoke/plume_data_mod.F90 similarity index 100% rename from smoke/plume_data_mod.F90 rename to physics/smoke/plume_data_mod.F90 diff --git a/smoke/rrfs_smoke_config.F90 b/physics/smoke/rrfs_smoke_config.F90 similarity index 100% rename from smoke/rrfs_smoke_config.F90 rename to physics/smoke/rrfs_smoke_config.F90 diff --git a/smoke/rrfs_smoke_data.F90 b/physics/smoke/rrfs_smoke_data.F90 similarity index 100% rename from smoke/rrfs_smoke_data.F90 rename to physics/smoke/rrfs_smoke_data.F90 diff --git a/smoke/rrfs_smoke_lsdep_wrapper.F90 b/physics/smoke/rrfs_smoke_lsdep_wrapper.F90 similarity index 100% rename from smoke/rrfs_smoke_lsdep_wrapper.F90 rename to physics/smoke/rrfs_smoke_lsdep_wrapper.F90 diff --git a/smoke/rrfs_smoke_lsdep_wrapper.meta b/physics/smoke/rrfs_smoke_lsdep_wrapper.meta similarity index 100% rename from smoke/rrfs_smoke_lsdep_wrapper.meta rename to physics/smoke/rrfs_smoke_lsdep_wrapper.meta diff --git a/smoke/rrfs_smoke_postpbl.F90 b/physics/smoke/rrfs_smoke_postpbl.F90 similarity index 100% rename from smoke/rrfs_smoke_postpbl.F90 rename to physics/smoke/rrfs_smoke_postpbl.F90 diff --git a/smoke/rrfs_smoke_postpbl.meta b/physics/smoke/rrfs_smoke_postpbl.meta similarity index 100% rename from smoke/rrfs_smoke_postpbl.meta rename to physics/smoke/rrfs_smoke_postpbl.meta diff --git a/smoke/rrfs_smoke_wrapper.F90 b/physics/smoke/rrfs_smoke_wrapper.F90 similarity index 100% rename from smoke/rrfs_smoke_wrapper.F90 rename to physics/smoke/rrfs_smoke_wrapper.F90 diff --git a/smoke/rrfs_smoke_wrapper.meta b/physics/smoke/rrfs_smoke_wrapper.meta similarity index 100% rename from smoke/rrfs_smoke_wrapper.meta rename to physics/smoke/rrfs_smoke_wrapper.meta diff --git a/smoke/seas_data_mod.F90 b/physics/smoke/seas_data_mod.F90 similarity index 100% rename from smoke/seas_data_mod.F90 rename to physics/smoke/seas_data_mod.F90 diff --git a/smoke/seas_mod.F90 b/physics/smoke/seas_mod.F90 similarity index 100% rename from smoke/seas_mod.F90 rename to physics/smoke/seas_mod.F90 diff --git a/smoke/seas_ngac_mod.F90 b/physics/smoke/seas_ngac_mod.F90 similarity index 100% rename from smoke/seas_ngac_mod.F90 rename to physics/smoke/seas_ngac_mod.F90