Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
branch = feature/capgen-v1
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
# url = https://github.com/ufs-community/ccpp-physics
# branch = ufs/dev
url = https://github.com/scrasmussen/ccpp-physics
branch = ufs-dev-rm-ccpp-physcons
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
12 changes: 8 additions & 4 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module GFS_typedefs

use mpi_f08
use machine, only: kind_phys, kind_dbl_prec, kind_sngl_prec
use physcons, only: rhowater
use physcons, only: rhowater, con_rocp
use module_radsw_parameters, only: topfsw_type, sfcfsw_type, NBDSW
use module_radlw_parameters, only: topflw_type, sfcflw_type, NBDLW
use module_mp_tempo_cfgs, only: ty_tempo_cfgs
Expand Down Expand Up @@ -60,6 +60,10 @@ module GFS_typedefs
integer, parameter :: LTP = 0 ! no extra top layer
!integer, parameter :: LTP = 1 ! add an extra top layer
integer, parameter :: con_zero = 0

! transferred from module physcons
real(kind=kind_phys),parameter:: con_qamin = 1.e-16_kind_phys !< Minimum aerosol concentration

!----------------
! Data Containers
!----------------
Expand Down Expand Up @@ -1070,7 +1074,7 @@ module GFS_typedefs
integer :: decfl !< deformed CFL factor
type(ty_tempo_cfgs) :: tempo_cfgs !< Tempo MP configuration information.
logical :: thompson_mp_is_init=.false. !< Local scheme initialization flag
logical :: tempo_mp_is_init=.false. !< Local scheme initialization flag
logical :: tempo_mp_is_init=.false. !< Local scheme initialization flag
real(kind=kind_phys) :: nt_c_l !< prescribed cloud liquid water number concentration over land
real(kind=kind_phys) :: nt_c_o !< prescribed cloud liquid water number concentration over ocean
real(kind=kind_phys) :: av_i !< transition value of coefficient matching at crossover from cloud ice to snow
Expand Down Expand Up @@ -3355,7 +3359,7 @@ subroutine coupling_create (Coupling, Model)
allocate (Coupling%nifa2d (IM))
Coupling%nwfa2d = clear_val
Coupling%nifa2d = clear_val
endif
endif

if(Model%rrfs_sd) then
!--- needed for smoke aerosol option
Expand Down Expand Up @@ -5999,7 +6003,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
endif
else
!--- Climatological ozone
err_message = Model%ozphys%load_o3clim('global_o3prdlos.f77',kozc)
err_message = Model%ozphys%load_o3clim('global_o3prdlos.f77',kozc,con_rocp)
end if

!--- NRL h2o photochemistry physics.
Expand Down
8 changes: 7 additions & 1 deletion ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
units = 1
dimensions = ()
type = integer
[con_qamin]
standard_name = minimum_aerosol_concentration
long_name = Minimum aerosol mass mixing ratio
units = kg kg-1
dimensions = ()
type = real
kind = kind_phys

########################################################################
[ccpp-table-properties]
Expand Down Expand Up @@ -10673,4 +10680,3 @@
type = real
kind = kind_phys
active = (do_lightning_threat_index_calculations)

2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 84 files
+8 −4 .gitmodules
+1 −1 physics/CONV/C3
+108 −40 physics/CONV/Chikira_Sugiyama/cs_conv.F90
+97 −1 physics/CONV/Chikira_Sugiyama/cs_conv.meta
+3 −2 physics/CONV/Grell_Freitas/cu_gf_deep.F90
+7 −4 physics/CONV/Grell_Freitas/cu_gf_driver.F90
+8 −0 physics/CONV/Grell_Freitas/cu_gf_driver.meta
+8 −5 physics/CONV/SAMF/samfaerosols.F
+4 −4 physics/CONV/SAMF/samfshalcnv.f
+8 −0 physics/CONV/SAMF/samfshalcnv.meta
+0 −4 physics/CONV/SAS/sascnvn.F
+0 −4 physics/CONV/SAS/shalcnv.F
+33 −16 physics/CONV/nTiedtke/cu_ntiedtke.F90
+49 −1 physics/CONV/nTiedtke/cu_ntiedtke.meta
+8 −2 physics/GWD/cires_ugwp.F90
+56 −0 physics/GWD/cires_ugwp.meta
+61 −23 physics/GWD/cires_ugwp_initialize.F90
+5 −3 physics/GWD/ugwp_driver_v0.F90
+8 −2 physics/GWD/unified_ugwp.F90
+40 −0 physics/GWD/unified_ugwp.meta
+6 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
+40 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
+5 −4 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90
+8 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta
+9 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.F90
+81 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.meta
+9 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.neptune.F90
+83 −3 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.neptune.meta
+9 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90
+81 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta
+2 −2 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
+54 −25 physics/MP/GFDL/fv_sat_adj.F90
+49 −1 physics/MP/GFDL/fv_sat_adj.meta
+52 −2 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90
+248 −1 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta
+123 −34 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.F90
+9 −4 physics/MP/Morrison_Gettelman/aer_cloud.F
+40 −14 physics/MP/Morrison_Gettelman/cldmacro.F
+42 −10 physics/MP/Morrison_Gettelman/cldwat2m_micro.F
+26 −10 physics/MP/Morrison_Gettelman/m_micro.F90
+1 −1 physics/MP/Morrison_Gettelman/m_micro.meta
+7 −2 physics/MP/calpreciptype.f90
+3 −3 physics/MP/multi_gases.F90
+19 −7 physics/PBL/HEDMF/hedmf.f
+33 −1 physics/PBL/HEDMF/hedmf.meta
+17 −8 physics/PBL/SATMEDMF/mfscu.f
+23 −8 physics/PBL/SATMEDMF/mfscuq.f
+6 −2 physics/PBL/SATMEDMF/satmedmfvdif.F
+4 −2 physics/PBL/SATMEDMF/satmedmfvdifq.F
+4 −2 physics/PBL/SATMEDMF/satmedmfvdifq_can.F
+19 −7 physics/PBL/mfpbl.f
+18 −8 physics/PBL/mfpblt.f
+18 −8 physics/PBL/mfpbltq.f
+59 −27 physics/Radiation/RRTMG/module_bfmicrophysics.f
+12 −10 physics/Radiation/RRTMG/radlw_main.F90
+41 −1 physics/Radiation/RRTMG/radlw_main.meta
+14 −9 physics/Radiation/RRTMG/radsw_main.F90
+41 −1 physics/Radiation/RRTMG/radsw_main.meta
+0 −1 physics/Radiation/radiation_surface.f
+1 −1 physics/SFC_Layer/MYNN/MYNN
+8 −6 physics/SFC_Layer/UFS/module_nst_model.f90
+2 −17 physics/SFC_Layer/UFS/module_nst_parameters.f90
+2 −3 physics/SFC_Layer/UFS/sfc_diag.f
+9 −1 physics/SFC_Layer/UFS/sfc_diag.meta
+5 −3 physics/SFC_Layer/UFS/sfc_nst.f90
+0 −4 physics/SFC_Models/Lake/Flake/flake_driver.F90
+8 −5 physics/SFC_Models/Land/Noah/lsm_noah.f
+16 −0 physics/SFC_Models/Land/Noah/lsm_noah.meta
+8 −10 physics/SFC_Models/Land/Noah/sflx.f
+22 −5 physics/SFC_Models/Land/RUC/lsm_ruc.F90
+81 −1 physics/SFC_Models/Land/RUC/lsm_ruc.meta
+35 −9 physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90
+1 −1 physics/SFC_Models/Land/sfc_land.F90
+0 −2 physics/SFC_Models/SeaIce/CICE/sfc_cice.f
+112 −0 physics/hooks/physcons.meta
+4 −3 physics/photochem/module_ozphys.F90
+1 −1 physics/photochem/module_ozphys.meta
+6 −6 physics/smoke_dust/rrfs_smoke_wrapper.F90
+0 −8 physics/smoke_dust/rrfs_smoke_wrapper.meta
+68 −52 physics/tools/funcphys.f90
+0 −1 physics/tools/get_phi_fv3.F90
+1 −1 physics/tools/get_phi_fv3.meta
Loading