Merge branch 'develop' into feature/wcoss2

Fixes ufs-community#559.

.github/workflows/debug-docs-test_coverage.yml

@@ -88,6 +88,7 @@ jobs:
       uses: actions/checkout@v2
       with: 
         path: ufs_utils
+        submodules: recursive
 
     - name: build
       run: |

.github/workflows/intel.yml

@@ -154,6 +154,7 @@ jobs:
       uses: actions/checkout@v2
       with: 
         path: ufs_utils
+        submodules: recursive
 
     - name: build
       run: |

.github/workflows/linux-mac-nceplibs-mpi.yml

@@ -205,6 +205,7 @@ jobs:
       uses: actions/checkout@v2
       with: 
         path: ufs_utils
+        submodules: recursive
 
     - name: build
       run: |

.github/workflows/netcdf-versions.yml

@@ -139,6 +139,7 @@ jobs:
       uses: actions/checkout@v2
       with: 
         path: ufs_utils
+        submodules: recursive
 
     - name: build
       run: |

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ccpp-physics"]
+	path = ccpp-physics
+	url = https://github.com/NCAR/ccpp-physics.git

README.md

@@ -51,6 +51,10 @@ And for the following third party libraries:
  - [HDF5](https://www.hdfgroup.org/solutions/hdf5/)
  - [PNG](http://www.libpng.org/pub/png/)
 
+It also uses the following repositories:
+
+ - [NCAR common community physics package](https://github.com/NCAR/ccpp-physics)
+
 ## Installing
 
 ```

sorc/global_cycle.fd/CMakeLists.txt

@@ -6,7 +6,7 @@
 set(lib_src
     machine.f90
     num_parthds.f90
-    sfcsub.F
+    ../../ccpp-physics/physics/sfcsub.F
     read_write_data.f90
     utils.F90
     land_increments.f90)

sorc/global_cycle.fd/cycle.f90

@@ -307,6 +307,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC,  &
                    ZSEA1,ZSEA2,ISOT,IVEGSRC,MYRANK)
 !
  USE READ_WRITE_DATA
+ use machine
  USE MPI
  USE LAND_INCREMENTS, ONLY: ADD_INCREMENT_SOIL,     &
                             ADD_INCREMENT_SNOW,     &
@@ -336,6 +337,9 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC,  &
  INTEGER             :: I, IERR
  INTEGER             :: I_INDEX(LENSFC), J_INDEX(LENSFC)
  INTEGER             :: IDUM(IDIM,JDIM)
+ integer             :: num_parthds, num_threads
+
+ real(kind=kind_io8) :: min_ice(lensfc)
 
  REAL                :: SLMASK(LENSFC), OROG(LENSFC)
  REAL                :: SIHFCS(LENSFC), SICFCS(LENSFC)
@@ -365,6 +369,7 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC,  &
  REAL, ALLOCATABLE   :: SLIFCS_FG(:)
  INTEGER, ALLOCATABLE :: LANDINC_MASK_FG(:), LANDINC_MASK(:)
  REAL, ALLOCATABLE   :: SND_BCK(:), SND_INC(:), SWE_BCK(:)
+ REAL(KIND=KIND_IO8), ALLOCATABLE :: SLMASKL(:), SLMASKW(:)
 
  TYPE(NSST_DATA)     :: NSST
  real, dimension(idim,jdim) :: tf_clm,tf_trd,sal_clm
@@ -513,22 +518,45 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC,  &
 
 !--------------------------------------------------------------------------------
 ! UPDATE SURFACE FIELDS.
+!
+! FIRST, SET WATER AND LAND MASKS - SLMASKW/SLMASKL. FOR UNCOUPLED
+! (NON-FRACTIONAL) MODE, THESE ARE IDENTICAL TO THE CURRENT
+! MASK - '0' WATER; '1' LAND.
 !--------------------------------------------------------------------------------
 
  IF (DO_SFCCYCLE) THEN
+   ALLOCATE(SLMASKL(LENSFC), SLMASKW(LENSFC))
+! for running uncoupled (non-fractional grid)
+   DO I=1,LENSFC
+     IF(NINT(SLMASK(I)) == 1) THEN
+       SLMASKL(I) = 1.0_KIND_io8
+       SLMASKW(I) = 1.0_KIND_io8
+     ELSE
+       SLMASKL(I) = 0.0_KIND_io8
+       SLMASKW(I) = 0.0_KIND_io8
+     ENDIF
+     if(nint(slmask(i)) == 0) then
+       min_ice(i) = 0.15_KIND_io8
+     else
+       min_ice(i) = 0.0_KIND_io8
+     endif
+   ENDDO  
+   num_threads = num_parthds()
    PRINT*
    PRINT*,"CALL SFCCYCLE TO UPDATE SURFACE FIELDS."
    CALL SFCCYCLE(LUGB,LENSFC,LSOIL,SIG1T,DELTSFC,          &
                IY,IM,ID,IH,FH,RLA,RLO,                   &
-               SLMASK,OROG, OROG_UF, USE_UFO, DO_NSST,   &
+               SLMASKL,SLMASKW, OROG, OROG_UF, USE_UFO, DO_NSST,   &
                SIHFCS,SICFCS,SITFCS,SNDFCS,SLCFCS,       &
                VMNFCS,VMXFCS,SLPFCS,ABSFCS,              &
                TSFFCS,SWEFCS,ZORFCS,ALBFCS,TG3FCS,       &
                CNPFCS,SMCFCS,STCFCS,SLIFCS,AISFCS,       &
                VEGFCS,VETFCS,SOTFCS,ALFFCS,              &
-               CVFCS,CVBFCS,CVTFCS,MYRANK,NLUNIT,        &
+               CVFCS,CVBFCS,CVTFCS,MYRANK,num_threads, NLUNIT,        &
                SZ_NML, INPUT_NML_FILE,                   &
+               min_ice, &
                IALB,ISOT,IVEGSRC,TILE_NUM,I_INDEX,J_INDEX)
+   DEALLOCATE(SLMASKL, SLMASKW)
  ENDIF
 
 !--------------------------------------------------------------------------------