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

Jump to bottom

disable CatchmentCNCLM45 (LSM_CHOICE=3) #900

Merged
merged 3 commits into from
Feb 21, 2024
Merged

disable CatchmentCNCLM45 (LSM_CHOICE=3) #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04ea1de
disable Catchment-CN4.5 parameter option in surface resource file
gmao-jkolassa Feb 13, 2024
2914b3c
removed option of LSM_CHOICE=3 (CatchCNCLM45) in a few case/if blocks…
gmao-rreichle Feb 14, 2024
d5fcb1f
Merge branch 'develop' into feature/jkolassa_disable_cn45
gmao-rreichle Feb 21, 2024
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
4 changes: 2 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ subroutine SetServices ( GC, RC )
call MAPL_GetResource (SCF, LAND_PARAMS, label='LAND_PARAMS:', DEFAULT="NRv7.2", __RC__ )
elseif (LSM_CHOICE.eq.2) then
call MAPL_GetResource (SCF, LAND_PARAMS, label='LAND_PARAMS:', DEFAULT="CN_CLM40", __RC__ )
elseif (LSM_CHOICE.eq.3) then
call MAPL_GetResource (SCF, LAND_PARAMS, label='LAND_PARAMS:', DEFAULT="CN_CLM45", __RC__ )
! elseif (LSM_CHOICE.eq.3) then
! call MAPL_GetResource (SCF, LAND_PARAMS, label='LAND_PARAMS:', DEFAULT="CN_CLM45", __RC__ )
else
_ASSERT(.FALSE.,'unknown LSM_CHOICE')
end if
Expand Down
8 changes: 4 additions & 4 deletions ...Comp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ subroutine SetServices ( GC, RC )
if ( LSM_CHOICE == 2 ) then
CATCHCN = MAPL_AddChild('CATCHCNCLM40'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM40_GridComp.so', RC=STATUS)
VERIFY_(STATUS)
else if ( LSM_CHOICE == 3 ) then
CATCHCN = MAPL_AddChild('CATCHCNCLM45'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM45_GridComp.so', RC=STATUS)
VERIFY_(STATUS)
! else if ( LSM_CHOICE == 3 ) then
! CATCHCN = MAPL_AddChild('CATCHCNCLM45'//trim(tmp), 'setservices_', parentGC=GC, sharedObj='libGEOScatchCNCLM45_GridComp.so', RC=STATUS)
! VERIFY_(STATUS)
else
_ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40) or 3 (CLM45)")
_ASSERT( .false., " LSM_CHOICE should equal 2 (CLM40)")
endif

wrap%ptr =>CATCHCN_INTERNAL_STATE
Expand Down
3 changes: 0 additions & 3 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
# CATCHMENT-CN model versions
# ---------------------------
# CN_CLM40 : Fanwei Zeng's science-validated and published Catchment-CN.4.0 (e0004s_transientCO2_05)
# CN_CLM45 : Eunjee Lee's Catchment-CN.4.5 simulations
#
# GEOSagcm=>LAND_PARAMS: NRv7.2
# GEOSldas=>LAND_PARAMS: NRv7.2
Expand Down Expand Up @@ -234,8 +233,6 @@

# ---- Prescribe daily LAI and SAI data from an archived CATCHCN simulation
#
# ! Important: PRESCRIBE_DVG is NOT functional for CN_CLM45 land model choice (LSM_CHOICE = 3);
# ! setting will be ignored
#
# 0 : NO, run CN Model interactively (default)
# 1 : YES, prescribe interannually varying LAI and SAI
Expand Down
35 changes: 18 additions & 17 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/SurfParams.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,24 @@ subroutine SurfParams_init(LAND_PARAMS,LSM_CHOICE, rc)
_ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
end select

else if (LSM_CHOICE==3) then
select case (LAND_PARAMS)

case ("CN_CLM45") ! parameters to reproduce Eunjee Lee's Catchment-CN4.5 fire carbon emission simulations
LAND_FIX = .TRUE.
CSOIL_2 = 70000. ! Post H5_0
WEMIN = 13.
AICEV = 0.107
AICEN = 19.893
FLWALPHA = 0.005
ASTRFR = 0.333 ! reverted
STEXP = 1. ! reverted
RSWILT = 2000.

case DEFAULT
_ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
end select
! else if (LSM_CHOICE==3) then
! select case (LAND_PARAMS)
!
! case ("CN_CLM45") ! parameters to reproduce Eunjee Lee's Catchment-CN4.5 fire carbon emission simulations
! LAND_FIX = .TRUE.
! CSOIL_2 = 70000. ! Post H5_0
! WEMIN = 13.
! AICEV = 0.107
! AICEN = 19.893
! FLWALPHA = 0.005
! ASTRFR = 0.333 ! reverted
! STEXP = 1. ! reverted
! RSWILT = 2000.
!
! case DEFAULT
! _ASSERT(.FALSE.,'LAND_PARAMS not valid or incompatible with LSM_CHOICE')
! end select

else
_ASSERT(.FALSE.,'land model choice not valid')
end if ! LSM_CHOICE
Expand Down