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

Initial updates to global_cycle for Noah-MP land model #774

Merged
merged 14 commits into from
Feb 21, 2023
Merged

Initial updates to global_cycle for Noah-MP land model #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
468ecee
Add new write routine that updates records from an
GeorgeGayno-NOAA Jan 25, 2023
7df8ccc
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Jan 26, 2023
228cb2b
Determine whether to process noah or noah-mp based on
GeorgeGayno-NOAA Feb 2, 2023
2e88092
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Feb 2, 2023
582021b
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Feb 2, 2023
00e0127
Begin writing a new output routine that updates an
GeorgeGayno-NOAA Feb 6, 2023
e2c468a
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Feb 6, 2023
c98feac
Add remaining variable to new write routine.
GeorgeGayno-NOAA Feb 8, 2023
0fb89c3
Point to new write routine for noah-mp.
GeorgeGayno-NOAA Feb 9, 2023
44c3f4b
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Feb 9, 2023
1063f9b
Remove old test write routine.
GeorgeGayno-NOAA Feb 9, 2023
85d64d9
Merge branch 'develop' into feature/cycle_noahmp
GeorgeGayno-NOAA Feb 16, 2023
6f62ceb
Remove old write routine.
GeorgeGayno-NOAA Feb 16, 2023
4e724bb
Rename write routine.
GeorgeGayno-NOAA Feb 16, 2023
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
31 changes: 22 additions & 9 deletions sorc/global_cycle.fd/cycle.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC, &
INTEGER :: IDUM(IDIM,JDIM)
integer :: num_parthds, num_threads

LOGICAL :: IS_NOAHMP=.FALSE.

real(kind=kind_io8) :: min_ice(lensfc)

REAL :: SLMASK(LENSFC), OROG(LENSFC)
Expand Down Expand Up @@ -475,7 +477,8 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC, &
! READ THE INPUT SURFACE DATA ON THE CUBED-SPHERE TILE.
!--------------------------------------------------------------------------------

CALL READ_DATA(LSOIL,LENSFC,DO_NSST,.false.,TSFFCS=TSFFCS,SMCFCS=SMCFCS, &
CALL READ_DATA(LSOIL,LENSFC,DO_NSST,.false.,IS_NOAHMP=IS_NOAHMP, &
TSFFCS=TSFFCS,SMCFCS=SMCFCS, &
SWEFCS=SWEFCS,STCFCS=STCFCS,TG3FCS=TG3FCS,ZORFCS=ZORFCS, &
CVFCS=CVFCS, CVBFCS=CVBFCS,CVTFCS=CVTFCS,ALBFCS=ALBFCS, &
VEGFCS=VEGFCS,SLIFCS=SLIFCS,CNPFCS=CNPFCS,F10M=F10M , &
Expand Down Expand Up @@ -712,14 +715,24 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LSM,LENSFC,LSOIL,DELTSFC, &
! WRITE OUT UPDATED SURFACE DATA ON THE CUBED-SPHERE TILE.
!--------------------------------------------------------------------------------

CALL WRITE_DATA(SLIFCS,TSFFCS,SWEFCS,TG3FCS,ZORFCS, &
ALBFCS,ALFFCS,VEGFCS,CNPFCS,F10M, &
T2M,Q2M,VETFCS,SOTFCS,USTAR,FMM,FHH, &
SICFCS,SIHFCS,SITFCS, &
TPRCP,SRFLAG,SNDFCS, &
VMNFCS,VMXFCS,SLPFCS,ABSFCS, &
SLCFCS,SMCFCS,STCFCS, &
IDIM,JDIM,LENSFC,LSOIL,DO_NSST,NSST)
IF (IS_NOAHMP) THEN

CALL WRITE_DATA(LENSFC,IDIM,JDIM,LSOIL,DO_NSST,NSST,VEGFCS=VEGFCS)

GeorgeGayno-NOAA marked this conversation as resolved.
Show resolved Hide resolved
ELSE

CALL WRITE_DATA(LENSFC,IDIM,JDIM,LSOIL, &
DO_NSST,NSST,SLIFCS=SLIFCS,TSFFCS=TSFFCS,VEGFCS=VEGFCS, &
SWEFCS=SWEFCS,TG3FCS=TG3FCS,ZORFCS=ZORFCS, &
ALBFCS=ALBFCS,ALFFCS=ALFFCS,CNPFCS=CNPFCS, &
F10M=F10M,T2M=T2M,Q2M=Q2M,VETFCS=VETFCS, &
SOTFCS=SOTFCS,USTAR=USTAR,FMM=FMM,FHH=FHH, &
SICFCS=SICFCS,SIHFCS=SIHFCS,SITFCS=SITFCS,TPRCP=TPRCP, &
SRFLAG=SRFLAG,SWDFCS=SNDFCS,VMNFCS=VMNFCS, &
VMXFCS=VMXFCS,SLPFCS=SLPFCS,ABSFCS=ABSFCS, &
SLCFCS=SLCFCS,SMCFCS=SMCFCS,STCFCS=STCFCS)

ENDIF

IF (DO_NSST) THEN
DEALLOCATE(NSST%C_0)
Expand Down
Loading