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

Pull in changes from feature/sdrabenh/r21c_G2G #735

Merged
merged 22 commits into from
Apr 19, 2023
Merged

Pull in changes from feature/sdrabenh/r21c_G2G #735

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
18e93bb
adds updates to handle GEOS-IT and GEOS-R21C system configurations
Apr 28, 2022
d8e606e
Changes required for QT, SL and PBLHRFRCT diagnostics
narnold1 Jul 14, 2022
fdd9a66
Updates for lowest-model-level forcing Collections. Also, some quick…
lltakacs Aug 23, 2022
fb39b7f
Merge pull request #622 from GEOS-ESM/feature/ltakacs/R21C_Low-Level-…
sdrabenh Aug 23, 2022
08eb29e
Added ice term to SL definition, added SL and T exports from Moist
narnold1 Sep 1, 2022
94dd3b2
Added total water QT export to MoistGridComp
narnold1 Sep 1, 2022
64fbe36
Merge pull request #629 from GEOS-ESM/feature/narnold1/r21c_moist_turb
sdrabenh Sep 7, 2022
fcd3c71
cleaned up LONG_NAME of various land-related export specs across Surf…
gmao-rreichle Sep 11, 2022
799c499
added OFRACI as a new diagnostic/export in surf
zhaobin74 Feb 16, 2022
425b29b
long name changes & landice gc mod
Nov 10, 2022
f6f557a
corrections to surface and landice gcs
Nov 14, 2022
e4ac725
Merge branch 'feature/lcandre2/r21c_landice_updates' into feature/rre…
Nov 16, 2022
bdd217d
changed long names in CatchCN GC to be consistent with Catch GC; addi…
gmao-rreichle Nov 17, 2022
25b7559
changed LONGNAME of interception storage (CAPAC)
gmao-rreichle Nov 18, 2022
e265148
minor long name changes for consistency
Nov 21, 2022
c70645d
Hand-merge conflicts of feature/sdrabenh/r21c_updates into v1.17.3
sdrabenh Mar 2, 2023
4e1d336
Hand-merge conflicts in turbulence
sdrabenh Mar 22, 2023
173ef63
Grab TKH and TKM required for calculations
sdrabenh Mar 24, 2023
d61cf87
Merge branch 'release/v1' into feature/sdrabenh/r21c_G2G
mathomp4 Apr 5, 2023
a410b29
Fixes for CI
mathomp4 Apr 5, 2023
64ca333
apply LONG_NAME changes to refactored CatchCNGridComps
sdrabenh Apr 12, 2023
0179922
fix longname for runoff in CatchCN GridComps
gmao-rreichle Apr 13, 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
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.23.0
bcs_version: &bcs_version v10.25.0

orbs:
ci: geos-esm/circleci-tools@1
Expand All @@ -21,6 +21,7 @@ workflows:
baselibs_version: *baselibs_version
repo: GEOSgcm
checkout_fixture: true
fixture_branch: release/v10
mepodevelop: true
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
# Run GCM (1 hour, no ExtData)
Expand Down
70 changes: 67 additions & 3 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2009,6 +2009,15 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME = 'CLDBASEHGT', &
LONG_NAME = 'Height_of_cloud_base', &
UNITS = 'm', &
DIMS = MAPL_DimsHorzOnly, &
VLOCATION = MAPL_VLocationNone, &
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME ='RL', &
LONG_NAME ='liquid_cloud_particle_effective_radius', &
Expand Down Expand Up @@ -2712,6 +2721,30 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='SL', &
LONG_NAME ='liquid_water_static_energy', &
UNITS ='J kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='QT', &
LONG_NAME ='total_water_specific_humidity', &
UNITS ='kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='T', &
LONG_NAME ='temperature', &
UNITS ='K', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME='KCBL_moist', &
LONG_NAME ='KCBL_before_moist', &
Expand Down Expand Up @@ -3573,6 +3606,14 @@ subroutine SetServices ( GC, RC )
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME ='QX1', &
LONG_NAME ='specific_humidity_after_moist_physics', &
UNITS ='kg kg-1', &
DIMS = MAPL_DimsHorzVert, &
VLOCATION = MAPL_VLocationCenter, RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddExportSpec(GC, &
SHORT_NAME ='QLLSX0', &
LONG_NAME ='initial_mass_fraction_of_large_scale_cloud_liquid_water', &
Expand Down Expand Up @@ -5648,7 +5689,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
!Record vars at top pf moist
real, pointer, dimension(:,:,:) :: Ux0, Vx0, THx0, KHx0
real, pointer, dimension(:,:) :: TSx0, FRLANDx0
real, pointer, dimension(:,:,:) :: Qx0, QLLSx0, QLCNx0, CLLSx0, CLCNx0, QILSx0, QICNx0, QCLSX0, QCCNX0
real, pointer, dimension(:,:,:) :: Qx0, Qx1, QLLSx0, QLCNx0, CLLSx0, CLCNx0, QILSx0, QICNx0, QCLSX0, QCCNX0

! MATMAT Exports for pre-ras inputs for RAStest
real, pointer, dimension(:,:,:) :: THOI,QHOI,QSSI,DQSI
Expand All @@ -5663,6 +5704,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
real, pointer, dimension(:,:,:) :: RSU_CN, RSU_AN, RSU_LS, ALPHT, ALPH1, ALPH2
real, pointer, dimension(:,:,:) :: ENTLAM
real, pointer, dimension(:,:,:) :: KHX
real, pointer, dimension(:,:,:) :: SLX, TX, QTX
real, pointer, dimension(:,: ) :: DTSX

real, pointer, dimension(:,:,:) :: REVSU_CN, REVSU_LSAN
Expand Down Expand Up @@ -6719,6 +6761,9 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
call MAPL_GetPointer(EXPORT, ZCBL, 'ZCBL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, TT_PRCP, 'TPREC' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, HOURNORAIN, 'HOURNORAIN' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, TX , 'T' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, SLX , 'SL' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, QTX , 'QT' , RC=STATUS); VERIFY_(STATUS)

call MAPL_GetPointer(EXPORT, PRCP_RAIN, 'PRCP_RAIN' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PRCP_SNOW, 'PRCP_SNOW' , RC=STATUS); VERIFY_(STATUS)
Expand All @@ -6736,6 +6781,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
call MAPL_GetPointer(EXPORT, XQICN, 'QICNX1' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, XCLCN, 'CLCN' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, XCLLS, 'CLLS' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, QX1, 'QX1' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, QCTOT, 'QCTOT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, QITOT, 'QITOT' , RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, QRTOT, 'QRTOT' , RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -12401,6 +12447,22 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
END WHERE
endif

if (associated(CLDBASEHGT)) then
CLDBASEx = MAPL_UNDEF
do i = 1,IM
do j = 1,JM
do k = LM-1, 1, -1
if (ZLE(i,j,k).gt.20000.) exit
if ( ( RAD_CF(i,j,k) .ge. 1e-2 ) .and. ( QTOT(i,j,k) .ge. 1e-6 ) ) then
CLDBASEx(i,j) = ZLE(i,j,k)
exit
end if
end do
end do
end do
CLDBASEHGT = CLDBASEx
end if


! Compute DBZ radar reflectivity
if (associated(DBZ) .OR. associated(DBZ_MAX)) then
Expand Down Expand Up @@ -12709,6 +12771,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
if (associated(AN_ARF )) AN_ARF = AN_ARFX
if (associated(CN_ARF )) CN_ARF = CN_ARFX
if (associated(SC_ARF )) SC_ARF = SC_ARFX
if (associated(QX1 )) QX1 = Q1
if (associated(XQLLS )) XQLLS = QLLS
if (associated(XQILS )) XQILS = QILS
if (associated(XCLLS )) XCLLS = CLLS
Expand All @@ -12731,8 +12794,9 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
if (associated(CCWP )) CCWP = SUM( CNV_QC *MASS , 3 )
if (associated(TPW )) TPW = SUM( Q1 *MASS , 3 )
if (associated(RH2 )) RH2 = max(MIN( Q1/GEOS_QSAT (TH1*PK, PLO) , 1.02 ),0.0)


if (associated(SLX )) SLX = GZLO + MAPL_CP*TEMP - MAPL_ALHL*(QLLS+QLCN) - MAPL_ALHS*(QILS+QICN)
if (associated(QTX )) QTX = Q1 + QLCN + QLLS + QICN + QILS
if (associated(TX )) TX = TEMP

if(adjustl(CLDMICRO)=="2MOMENT") then
if (associated(CCNCOLUMN )) CCNCOLUMN = SUM(CCN1*MASS/(100.*PLO*r_air/TEMP) , 3)
Expand Down
Loading