Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
14695e4
copy feature/tendency_cleanup changes from SCM to fv3atm for first su…
grantfirl Apr 16, 2025
989412e
update ccpp/physics submodule pointer
grantfirl Apr 16, 2025
44189b1
use FMS version of get_tracer_index in GFS_typedefs
grantfirl Apr 17, 2025
eeb90e3
fix get_tracer_index calls with MODEL_ATMOS
grantfirl Apr 17, 2025
ce24002
fix integer underflow in control_scavenging_initialize
grantfirl Apr 17, 2025
78cc01a
add ccpp/physics submodule change due to need for CMakeLists.txt chan…
grantfirl Apr 17, 2025
a0a03b8
Merge branch 'rm_gfdl_parse_tracers' into feature/tendency_cleanup
grantfirl Apr 17, 2025
b160301
update ccpp/physics submodule pointer after diagnostics/save cleanup
grantfirl May 8, 2025
b4f73cd
Merge branch 'develop' into feature/tendency_cleanup
grantfirl May 8, 2025
99be359
update ccpp/physics submodule pointer
grantfirl May 8, 2025
7bc286c
update ccpp/physics
grantfirl May 8, 2025
692c676
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Jun 4, 2025
d093b69
update typedefs and GFS_v17_p8/ugwpv1 suites
grantfirl Jun 4, 2025
f5b2322
update host metadata, prebuild, and RRFS_v1beta suite for latest tend…
grantfirl Jun 12, 2025
5ec7f9e
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Jun 18, 2025
0fa1068
update ccpp/physics
grantfirl Jun 18, 2025
0c52645
update ccpp-physics
grantfirl Jul 9, 2025
f263a31
remove obsolete schemes from ccpp_prebuild_config.py
grantfirl Jul 9, 2025
5ef6dfd
update remainder of suites by adding new post interstitials and remov…
grantfirl Jul 9, 2025
f464f61
update ccpp/physics
grantfirl Jul 10, 2025
7ce899d
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Jul 10, 2025
4b1281f
update ccpp/physics
grantfirl Jul 10, 2025
994dfbe
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Jul 14, 2025
8868a80
modify new suites
grantfirl Jul 15, 2025
b7000b6
update TEMPO suite to remove obsolete tempo_pre scheme
grantfirl Jul 16, 2025
42a6c03
update ccpp/physics
grantfirl Jul 16, 2025
f8f28e7
update ccpp/physics submodule
grantfirl Jul 30, 2025
4b6c030
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Sep 18, 2025
17e724e
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Dec 18, 2025
6b0fa7e
fix horizontal_dimension in CCPP_typedefs.meta
grantfirl Dec 18, 2025
63dcef9
update ccpp/physics
grantfirl Dec 18, 2025
0c20906
update ccpp/physics
grantfirl Dec 18, 2025
9574363
update ccpp/physics
grantfirl Dec 18, 2025
ac2c245
deallocate new interstitial variables when done using them
grantfirl Dec 22, 2025
5441ffe
remove obsolete schemes from new suites
grantfirl Dec 23, 2025
797faee
Merge branch 'develop' into feature/tendency_cleanup
grantfirl Jan 22, 2026
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 = develop
[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/grantfirl/ccpp-physics
branch = feature/tendency_cleanup
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
9 changes: 2 additions & 7 deletions ccpp/config/ccpp_prebuild_config_fv3.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,17 @@
# Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ];
# current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the
# suite definition file have to belong to the same physics set
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_photochemistry_post.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.F90',
Expand All @@ -115,8 +113,6 @@
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90',
'physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90',
Expand Down Expand Up @@ -174,10 +170,8 @@
'physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90',
'physics/physics/MP/Morrison_Gettelman/m_micro_post.F90',
'physics/physics/MP/NSSL/mp_nssl.F90',
'physics/physics/MP/Thompson/mp_thompson_pre.F90',
'physics/physics/MP/Thompson/mp_thompson.F90',
'physics/physics/MP/Thompson/mp_thompson_post.F90',
'physics/physics/MP/TEMPO/mp_tempo_pre.F90',
'physics/physics/MP/TEMPO/mp_tempo.F90',
'physics/physics/MP/TEMPO/mp_tempo_post.F90',
'physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f',
Expand All @@ -187,6 +181,7 @@
'physics/physics/PBL/SHOC/shoc.F90',
'physics/physics/PBL/MYJ/myjpbl_wrapper.F90',
'physics/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90',
'physics/physics/PBL/MYNN_EDMF/mynnedmf_wrapper_post.F90',
'physics/physics/PBL/SATMEDMF/satmedmfvdif.F',
'physics/physics/PBL/SATMEDMF/satmedmfvdifq.F',
'physics/physics/PBL/YSU/ysuvdif.F90',
Expand Down
20 changes: 20 additions & 0 deletions ccpp/data/CCPP_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ module CCPP_typedefs
real (kind=kind_phys), pointer :: cld1d(:) => null() !<
real (kind=kind_phys), pointer :: clouds(:,:,:) => null() !<
real (kind=kind_phys), pointer :: clw(:,:,:) => null() !<
real (kind=kind_phys), pointer :: dclw(:,:,:) => null() !<
real (kind=kind_phys), pointer :: clx(:,:) => null() !<
real (kind=kind_phys), pointer :: cmm_ice(:) => null() !<
real (kind=kind_phys), pointer :: cmm_land(:) => null() !<
Expand Down Expand Up @@ -261,6 +262,10 @@ module CCPP_typedefs
real (kind=kind_phys), pointer :: stress_land(:) => null() !<
real (kind=kind_phys), pointer :: stress_water(:) => null() !<
real (kind=kind_phys), pointer :: t2mmp(:) => null() !<
real (kind=kind_phys), pointer :: ten_q(:,:,:) => null()
real (kind=kind_phys), pointer :: ten_t(:,:) => null()
real (kind=kind_phys), pointer :: ten_u(:,:) => null()
real (kind=kind_phys), pointer :: ten_v(:,:) => null()
real (kind=kind_phys), pointer :: theta(:) => null() !<
real (kind=kind_phys), pointer :: tlvl(:,:) => null() !<
real (kind=kind_phys), pointer :: tkeh(:,:) => null() !< vertical turbulent kinetic energy (m2/s2) at the model layer interfaces
Expand Down Expand Up @@ -528,6 +533,7 @@ subroutine gfs_interstitial_create (Interstitial, ixs, ixe, Model)
allocate (Interstitial%cld1d (ixs:ixe))
allocate (Interstitial%clouds (ixs:ixe,Model%levr+LTP,NF_CLDS))
allocate (Interstitial%clw (ixs:ixe,Model%levs,Interstitial%nn))
allocate (Interstitial%dclw (ixs:ixe,Model%levs,Interstitial%nn))
allocate (Interstitial%clx (ixs:ixe,4))
allocate (Interstitial%cmm_ice (ixs:ixe))
allocate (Interstitial%cmm_land (ixs:ixe))
Expand Down Expand Up @@ -673,6 +679,10 @@ subroutine gfs_interstitial_create (Interstitial, ixs, ixe, Model)
allocate (Interstitial%stress_ice (ixs:ixe))
allocate (Interstitial%stress_land (ixs:ixe))
allocate (Interstitial%stress_water (ixs:ixe))
allocate (Interstitial%ten_q (ixs:ixe,Model%levs,Model%ntrac))
allocate (Interstitial%ten_t (ixs:ixe,Model%levs))
allocate (Interstitial%ten_u (ixs:ixe,Model%levs))
allocate (Interstitial%ten_v (ixs:ixe,Model%levs))
allocate (Interstitial%theta (ixs:ixe))
allocate (Interstitial%tkeh (ixs:ixe,Model%levs+1)) !Vertical turbulent kinetic energy at model layer interfaces
allocate (Interstitial%tlvl (ixs:ixe,Model%levr+1+LTP))
Expand Down Expand Up @@ -876,6 +886,7 @@ subroutine gfs_interstitial_destroy (Interstitial, Model)
deallocate (Interstitial%cld1d)
deallocate (Interstitial%clouds)
deallocate (Interstitial%clw)
deallocate (Interstitial%dclw)
deallocate (Interstitial%clx)
deallocate (Interstitial%cmm_ice)
deallocate (Interstitial%cmm_land)
Expand Down Expand Up @@ -1021,6 +1032,10 @@ subroutine gfs_interstitial_destroy (Interstitial, Model)
deallocate (Interstitial%stress_ice)
deallocate (Interstitial%stress_land)
deallocate (Interstitial%stress_water)
deallocate (Interstitial%ten_q)
deallocate (Interstitial%ten_t)
deallocate (Interstitial%ten_u)
deallocate (Interstitial%ten_v)
deallocate (Interstitial%theta)
deallocate (Interstitial%tkeh)
deallocate (Interstitial%tlvl)
Expand Down Expand Up @@ -1422,6 +1437,7 @@ subroutine gfs_interstitial_reset (Interstitial, Model)
Interstitial%clouds = clear_val
Interstitial%clw = clear_val
Interstitial%clw(:,:,2) = -999.9
Interstitial%dclw = clear_val
Interstitial%clx = clear_val
Interstitial%cmm_ice = Model%huge
Interstitial%cmm_land = Model%huge
Expand Down Expand Up @@ -1578,6 +1594,10 @@ subroutine gfs_interstitial_reset (Interstitial, Model)
Interstitial%stress_ice = Model%huge
Interstitial%stress_land = Model%huge
Interstitial%stress_water = Model%huge
Interstitial%ten_q = clear_val
Interstitial%ten_t = clear_val
Interstitial%ten_u = clear_val
Interstitial%ten_v = clear_val
Interstitial%theta = clear_val
Interstitial%tkeh = 0
Interstitial%tlvl = clear_val
Expand Down
Loading