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

Updates to CatchCN GridComp so it can reproduce Fanwei's science-tested LDASsa version of CatchCN #311

Merged
merged 8 commits into from
Oct 29, 2020
Merged

Updates to CatchCN GridComp so it can reproduce Fanwei's science-tested LDASsa version of CatchCN #311

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef728ea
added LSM_CHOICE to SurfParams_init call
gmao-jkolassa Sep 18, 2020
3a6013c
pointing to feature/jkolassa_#287_fixes branch of GEOSgcm_GridComp
gmao-jkolassa Sep 28, 2020
1805166
added LSM_CHOICE to SurfParams_init call
gmao-jkolassa Sep 18, 2020
ecb28ed
pointing to feature/jkolassa_#287_fixes branch of GEOSgcm_GridComp
gmao-jkolassa Sep 28, 2020
dfdc55d
Merge branch 'feature/jkolassa_#287_fixes_match' of github.com:GEOS-E…
gmao-jkolassa Oct 14, 2020
2fb8cf8
added 'rc=status' to SurfParams_init call
gmao-jkolassa Oct 23, 2020
7cf36dd
Merge branch 'develop' into feature/jkolassa_#287_fixes_match
gmao-jkolassa Oct 28, 2020
63e819c
Update Externals.cfg
gmao-jkolassa Oct 28, 2020
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
7 changes: 5 additions & 2 deletions src/Components/GEOSldas_GridComp/GEOS_LdasGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ subroutine Initialize(gc, import, export, clock, rc)

integer,dimension(:),pointer :: f2g
integer :: N_catf
integer :: LSM_CHOICE

type(grid_def_type) :: tile_grid_g
type(grid_def_type) :: tile_grid_f
Expand Down Expand Up @@ -422,8 +423,10 @@ subroutine Initialize(gc, import, export, clock, rc)
! Init catchment constants, currently different in GCM and GEOSldas
call MAPL_GetResource(MAPL, LAND_PARAMS,Label="LAND_PARAMS:",DEFAULT="Icarus",RC=STATUS)
VERIFY_(STATUS)
call SurfParams_init(LAND_PARAMS)

call MAPL_GetResource ( MAPL, LSM_CHOICE, Label="LSM_CHOICE:", DEFAULT=1, RC=STATUS)
VERIFY_(STATUS)
call SurfParams_init(LAND_PARAMS,LSM_CHOICE,rc=status)
VERIFY_(STATUS)

call MAPL_GetResource(MAPL, grid_type,Label="GEOSldas.GRID_TYPE:",RC=STATUS)
VERIFY_(STATUS)
Expand Down