diff --git a/ccpp-physics b/ccpp-physics index 3a306a493..9b0ac7b16 160000 --- a/ccpp-physics +++ b/ccpp-physics @@ -1 +1 @@ -Subproject commit 3a306a493a9a0b6c3c39c7b50d356f0ddb7c5c94 +Subproject commit 9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 diff --git a/sorc/global_cycle.fd/CMakeLists.txt b/sorc/global_cycle.fd/CMakeLists.txt index 7adfae13f..f52c2d86d 100644 --- a/sorc/global_cycle.fd/CMakeLists.txt +++ b/sorc/global_cycle.fd/CMakeLists.txt @@ -6,7 +6,7 @@ set(lib_src machine.f90 num_parthds.f90 - ../../ccpp-physics/physics/sfcsub.F + ../../ccpp-physics/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F read_write_data.f90 utils.F90 land_increments.f90) diff --git a/sorc/global_cycle.fd/cycle.f90 b/sorc/global_cycle.fd/cycle.f90 index 859fbd0c0..5191a5ffa 100644 --- a/sorc/global_cycle.fd/cycle.f90 +++ b/sorc/global_cycle.fd/cycle.f90 @@ -357,7 +357,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, & REAL :: VMNFCS(LENSFC), T2M(LENSFC) REAL :: Q2M(LENSFC), SLPFCS(LENSFC) REAL :: ABSFCS(LENSFC), OROG_UF(LENSFC) - REAL :: USTAR(LENSFC) + REAL :: USTAR(LENSFC), SOCFCS(LENSFC) REAL :: FMM(LENSFC), FHH(LENSFC) REAL :: RLA(LENSFC), RLO(LENSFC) REAL(KIND=4) :: ZSOIL(LSOIL) @@ -597,6 +597,8 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, & endif ENDDO + SOCFCS=0 ! Soil color. Not used yet. + num_threads = num_parthds() PRINT* PRINT*,"CALL SFCCYCLE TO UPDATE SURFACE FIELDS." @@ -607,7 +609,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, & VMNFCS,VMXFCS,SLPFCS,ABSFCS, & TSFFCS,SWEFCS,ZORFCS,ALBFCS,TG3FCS, & CNPFCS,SMCFCS,STCFCS,SLIFCS,AISFCS, & - VEGFCS,VETFCS,SOTFCS,ALFFCS, & + VEGFCS,VETFCS,SOTFCS,SOCFCS,ALFFCS, & CVFCS,CVBFCS,CVTFCS,MYRANK,num_threads, NLUNIT, & SZ_NML, INPUT_NML_FILE, & min_ice, &