From f4044e949ff606a95115db2bd551f11f48b01020 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 2 Jun 2022 19:49:28 -0400 Subject: [PATCH] point to the release/public-v6 branch of ccpp-physics; undo latest ccpp_prebuild_config.py changes that don't belong in the release --- .gitmodules | 2 +- ccpp/config/ccpp_prebuild_config.py | 4 ---- ccpp/physics | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..26ec39161 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics - branch = main + branch = release/public-v6 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index a95b86203..bb3582dee 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -213,10 +213,6 @@ 'physics/physics/sfc_sice.f', # 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', # RRTMGP 'physics/physics/rrtmgp_lw_gas_optics.F90', 'physics/physics/rrtmgp_lw_cloud_optics.F90', diff --git a/ccpp/physics b/ccpp/physics index 6e58242e1..bf260fabb 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6e58242e1776b96db1297942f0ea6d961e7dde37 +Subproject commit bf260fabbeb9443547588024ed9112f441ddfe4a