Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

global_cycle - Link to CCPP version of sfcsub.F #636

Merged
merged 41 commits into from
May 25, 2022
Merged

global_cycle - Link to CCPP version of sfcsub.F #636

Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2fffb11
feature/sfcsub_ccpp
GeorgeGayno-NOAA Mar 25, 2021
04b8974
Point to ccpp version of sfcsub.F Update cycle.f90 for new
GeorgeGayno-NOAA Mar 25, 2021
e82f0ae
Update workflow for ccpp submodule.
GeorgeGayno-NOAA Mar 25, 2021
c569e1f
Update other workflow for ccpp submodule.
GeorgeGayno-NOAA Mar 25, 2021
79040d1
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 1, 2021
9761d9f
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 14, 2021
8654bf4
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 21, 2021
9c89395
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 21, 2021
e0bfbeb
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 23, 2021
5c03c0f
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 26, 2021
c37aeaa
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 27, 2021
dc945e2
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 29, 2021
959be28
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 13, 2021
dcff978
Update workflow
GeorgeGayno-NOAA May 13, 2021
9f7ee5b
Update remaining workflows
GeorgeGayno-NOAA May 13, 2021
f5037e0
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 26, 2021
7c56158
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Jun 16, 2021
04bee48
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Jun 22, 2021
d2a6503
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Jun 28, 2021
3da59a1
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Jul 1, 2021
36653a8
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Aug 3, 2021
3c350d8
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Aug 17, 2021
ac5cc8d
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Sep 1, 2021
972ffda
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Oct 8, 2021
1603729
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Mar 18, 2022
11cb1d0
Update to the latest ccpp version of sfcsub.F
GeorgeGayno-NOAA Mar 18, 2022
80f9224
Remove some commented out code.
GeorgeGayno-NOAA Mar 21, 2022
bdcdb38
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Mar 23, 2022
50d3d02
Use 'https' instead of 'ssh' for linking to ccpp repo.
GeorgeGayno-NOAA Mar 23, 2022
db54641
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Mar 23, 2022
2ce7a73
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Mar 28, 2022
668d0b8
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA Apr 25, 2022
1a43979
Update to use latest version fo ccpp repo.
GeorgeGayno-NOAA Apr 25, 2022
7f5e63f
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 4, 2022
9ad8bb2
Use latest version of ccpp physics.
GeorgeGayno-NOAA May 4, 2022
ab52c26
Update comments about new mask variables.
GeorgeGayno-NOAA May 6, 2022
975287d
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 13, 2022
3cb7cae
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 20, 2022
210b186
Merge branch 'develop' into feature/sfcsub_ccpp
GeorgeGayno-NOAA May 24, 2022
72041b6
Update README.md
GeorgeGayno-NOAA May 25, 2022
4141dce
Fix typo in README.md
GeorgeGayno-NOAA May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/debug-docs-test_coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
uses: actions/checkout@v2
with:
path: ufs_utils
submodules: recursive

- name: build
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ jobs:
uses: actions/checkout@v2
with:
path: ufs_utils
submodules: recursive

- name: build
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux-mac-nceplibs-mpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ jobs:
uses: actions/checkout@v2
with:
path: ufs_utils
submodules: recursive

- name: build
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/netcdf-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ jobs:
uses: actions/checkout@v2
with:
path: ufs_utils
submodules: recursive

- name: build
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "ccpp-physics"]
GeorgeGayno-NOAA marked this conversation as resolved.
Show resolved Hide resolved
path = ccpp-physics
url = https://github.com/NCAR/ccpp-physics.git
1 change: 1 addition & 0 deletions ccpp-physics
Open in desktop
Submodule ccpp-physics added at 3405ff
2 changes: 1 addition & 1 deletion sorc/global_cycle.fd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
set(lib_src
machine.f90
num_parthds.f90
sfcsub.F
../../ccpp-physics/physics/sfcsub.F
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GeorgeGayno-NOAA When I tried your ccpp-physics branch, ufs_utils failed to compile because this file ../../ccpp-physics/physics/sfcsub.F does not exist. For global-workflow, this file can be linked to ../../../ufs_model.fd/FV3/ccpp/physics/physics/sfcsub.F; otherwise, you need to check out this file from CCPP github repo.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try 'git clone --recursive'.

Or 'git submodule init', then 'git submodule update'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it. thanks

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing. I can't add fractional grid support for global_cycle (#549) until this PR is merged.

read_write_data.f90
utils.F90
land_increments.f90)
Expand Down
32 changes: 30 additions & 2 deletions sorc/global_cycle.fd/cycle.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, &
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
GeorgeGayno-NOAA marked this conversation as resolved.
Show resolved Hide resolved
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
GeorgeGayno-NOAA marked this conversation as resolved.
Show resolved Hide resolved
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

!--------------------------------------------------------------------------------
Expand Down
Loading