udpate ccpp/physics, revert .gitmodules, and submit a tested bugfix

NCAR · Oct 5, 2023 · 06b0a2b · 06b0a2b
1 parent c984e70
commit 06b0a2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
diff --git 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
+9 −1		physics/GFS_debug.F90
+7 −0		physics/GFS_debug.meta
+12 −6		physics/GFS_phys_time_vary.fv3.F90
+7 −0		physics/GFS_phys_time_vary.fv3.meta
+8 −6		physics/GFS_surface_generic_post.F90
+28 −0		physics/GFS_surface_generic_post.meta
+18 −13		physics/GFS_surface_generic_pre.F90
+29 −1		physics/GFS_surface_generic_pre.meta
+6 −2		physics/gcycle.F90
+29 −23		physics/module_sf_noahmp_glacier.F90
+579 −177		physics/module_sf_noahmplsm.F90
+1,285 −997		physics/noahmp_tables.f90
+158 −19		physics/noahmpdrv.F90
+14 −0		physics/noahmpdrv.meta
+780 −0		physics/noahmptable.tbl
+4 −2		physics/sfc_diag_post.F90
+7 −0		physics/sfc_diag_post.meta
+232 −101		physics/sfcsub.F