Smoke, dust, and MYNN updates (#635)

* MYNN update * "merge RRFS-SD from the GSL repo to the Community repo" * "include MYNN-EDMF updates from PR #630" Co-authored-by: joeolson42 <Joseph.B.Olson@noaa.gov> Co-authored-by: Haiqin.Li <Haiqin.Li@noaa.gov>
NOAA-EMC · Mar 27, 2023 · 29085aa · 29085aa
1 parent f3eeba0
commit 29085aa
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