From 06b0a2b6d1546116d84e1e0500342559c437b770 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 5 Oct 2023 13:34:42 -0400 Subject: [PATCH] udpate ccpp/physics, revert .gitmodules, and submit a tested bugfix --- .gitmodules | 6 ++---- ccpp/physics | 2 +- scm/src/scm_input.F90 | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index b93233808..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR78 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index ede5b1d34..c83cd1714 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ede5b1d34f0dbbc1275617c49e18d561253b8d96 +Subproject commit c83cd1714c9674f87944a48d82c287ce1660d226 diff --git a/scm/src/scm_input.F90 b/scm/src/scm_input.F90 index 55a869078..a39404366 100644 --- a/scm/src/scm_input.F90 +++ b/scm/src/scm_input.F90 @@ -2038,7 +2038,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input) scm_input%input_T_surf = input_force_ts(:) scm_state%surface_thermo_control = 2 end if - else if (input_surfaceForcingTemp == 'surface_flux') then + else if (input_surfaceForcingTemp == 'kinematic') then !overwrite sfc_flux_spec scm_state%sfc_flux_spec = .true. scm_state%surface_thermo_control = 0