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

Auto PR - develop → MAPL-v3 - 1. Move call get_vegopacity and nod_data_check #690

Merged
merged 6 commits into from
Dec 10, 2023
Merged

Auto PR - develop → MAPL-v3 - 1. Move call get_vegopacity and nod_data_check #690

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d4806b
1. Move call get_vegopacity and nod_data_check
amfox37 Nov 22, 2023
1bf4883
Merge branch 'develop' into bugfix/amfox/not_using_mwrtm
gmao-rreichle Dec 3, 2023
c06a616
switch to allocate(mwRTM_param(0))
amfox37 Dec 6, 2023
3c461de
Merge branch 'bugfix/amfox/not_using_mwrtm' of https://github.com/GEO…
amfox37 Dec 6, 2023
0b7e085
Merge branch 'develop' into bugfix/amfox/not_using_mwrtm
gmao-rreichle Dec 7, 2023
61d59b7
Bug fix: Remove inadvertent requirement for mwRTM parameter input fil…
gmao-rreichle Dec 7, 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
30 changes: 20 additions & 10 deletions src/Components/GEOSldas_GridComp/GEOSlandassim_GridComp/GEOS_LandAssimGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,19 +1886,29 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
)
_VERIFY(status)

! mwRTM_param already contains static parameters, only need vegopacity.
if ( mwRTM ) then

call get_vegopacity(MAPL, clock, N_catl, rc=status)
_VERIFY(STATUS)
! mwRTM_param already contains static parameters, only need vegopacity.

! Check no-data consistency of vegetation attenuation parameter values.
! Good values are allowed for either the relevant static parameters
! (bh, bv, lewt) or for the vegopacity values from the file, but not both.

do ii=1,N_catl
call mwRTM_param_nodata_check( mwRTM_param(ii) )
end do
call get_vegopacity(MAPL, clock, N_catl, rc=status)
_VERIFY(STATUS)

! Check no-data consistency of vegetation attenuation parameter values.
! Good values are allowed for either the relevant static parameters
! (bh, bv, lewt) or for the vegopacity values from the file, but not both.

do ii=1,N_catl
call mwRTM_param_nodata_check( mwRTM_param(ii) )
end do

endif

if(.not. allocated(mwRTM_param)) then

allocate(mwRTM_param(0))

endif

call get_enkf_increments( &
date_time_new, &
NUM_ENSEMBLE, N_catl, N_catf, N_obsl_max, &
Expand Down