Point to latest version of ccpp-physics.

Add new soil color argument. Fixes ufs-community#933.
GeorgeGayno-NOAA · Apr 24, 2024 · 30e17b2 · 30e17b2
1 parent ef3a1d2
commit 30e17b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ccpp-physics b/ccpp-physics
diff --git 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
@@ -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, &