From 4ddd7a98e995b8e14f70a5c14f916a941fbcadd6 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 31 Oct 2023 14:02:28 -0400 Subject: [PATCH] update CCPP_typedefs.F90 for UFS-dev PR88 plus ccpp/physics submodule update and .gitmodules change for testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- scm/src/CCPP_typedefs.F90 | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..1b9e6c12a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = ufs-dev-PR88 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index c83cd1714..e1ccc99c6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c83cd1714c9674f87944a48d82c287ce1660d226 +Subproject commit e1ccc99c6eb48b6700513c4bb4315fca131fbd6a diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90 index 6be455d89..80de0fc9a 100644 --- a/scm/src/CCPP_typedefs.F90 +++ b/scm/src/CCPP_typedefs.F90 @@ -867,6 +867,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model) if (Model%imp_physics == Model%imp_physics_thompson) then if (Model%ltaerosol) then Interstitial%nvdiff = 12 + else if (Model%mraerosol) then + Interstitial%nvdiff = 10 else Interstitial%nvdiff = 9 endif @@ -956,6 +958,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model) elseif (Model%imp_physics == Model%imp_physics_thompson) then if (Model%ltaerosol) then Interstitial%nvdiff = 12 + else if (Model%mraerosol) then + Interstitial%nvdiff = 10 else Interstitial%nvdiff = 9 endif