Merge pull request NCAR#402 from grantfirl/ufs-dev-PR88

UFS-dev PR#88
grantfirl · Dec 1, 2023 · 7016757 · 7016757
2 parents ed1619e + b21c4e4
commit 7016757
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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
diff --git 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