Merge pull request #90 from grantfirl/ufs-dev-PR54

UFS-dev PR#54
NCAR · Apr 14, 2023 · e5ff845 · e5ff845
2 parents 11c3168 + 1725dc6
commit e5ff845
Show file tree

Hide file tree

Showing 10 changed files with 713 additions and 268 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -188,9 +188,8 @@
     # HAFS FER_HIRES
     'physics/physics/mp_fer_hires.F90',
     # SMOKE
-    'physics/smoke/rrfs_smoke_wrapper.F90',
-    'physics/smoke/rrfs_smoke_postpbl.F90',
-    'physics/smoke/rrfs_smoke_lsdep_wrapper.F90',
+    'physics/physics/smoke_dust/rrfs_smoke_wrapper.F90',
+    'physics/physics/smoke_dust/rrfs_smoke_postpbl.F90',
     # RRTMGP
     'physics/physics/rrtmgp_aerosol_optics.F90',
     'physics/physics/rrtmgp_lw_main.F90',

diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90